jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

provision: add ipv6 config

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-04-25 19:33:04 +02:00
parent 017e46fa0f
commit 2f425f8119
7 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/js/client.js
+1 -10
View File
@@ -1512,16 +1512,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
});
};
Client.prototype.restore = function (backupConfig, remotePath, version, ipv4Config, skipDnsSetup, setupToken, callback) {
var data = {
backupConfig: backupConfig,
remotePath: remotePath,
version: version,
ipv4Config: ipv4Config,
skipDnsSetup: skipDnsSetup,
setupToken: setupToken
};
Client.prototype.restore = function (data, callback) {
post('/api/v1/provision/restore', data, null, function (error, data, status) {
if (error) return callback(error);
if (status !== 200) return callback(new ClientError(status));
dashboard/src/js/restore.js
+16 -9
View File
@@ -61,7 +61,13 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
ifname: ''
};
$scope.ipv4Providers = [
$scope.ipv6Config = {
provider: 'generic',
ip: '',
ifname: ''
};
$scope.ipProviders = [
{ name: 'Disabled', value: 'noop' },
{ name: 'Public IP', value: 'generic' },
{ name: 'Static IP Address', value: 'fixed' },
@@ -225,16 +231,17 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
return;
}
var ipv4Config = {
provider: $scope.ipv4Config.provider
var data = {
backupConfig: backupConfig,
remotePath: $scope.remotePath.replace(/\.tar\.gz(\.enc)?$/, ''),
version: version ? version[1] : '',
ipv4Config: $scope.ipv4Config,
ipv6Config: $scope.ipv6Config,
skipDnsSetup: $scope.skipDnsSetup,
setupToken: $scope.setupToken
};
if ($scope.ipv4Config.provider === 'fixed') {
ipv4Config.ip = $scope.ipv4Config.ip;
} else if ($scope.ipv4Config.provider === 'network-interface') {
ipv4Config.ifname = $scope.ipv4Config.ifname;
}
Client.restore(backupConfig, $scope.remotePath.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', ipv4Config, $scope.skipDnsSetup, $scope.setupToken, function (error) {
Client.restore(data, function (error) {
$scope.busy = false;
if (error) {
dashboard/src/js/setupdns.js
+9 -11
View File
@@ -32,7 +32,13 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
ifname: ''
};
$scope.ipv4Providers = [
$scope.ipv6Config = {
provider: 'generic',
ip: '',
ifname: ''
};
$scope.ipProviders = [
{ name: 'Disabled', value: 'noop' },
{ name: 'Public IP', value: 'generic' },
{ name: 'Static IP Address', value: 'fixed' },
@@ -223,15 +229,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
tlsConfig.wildcard = true;
}
var ipv4Config = {
provider: $scope.ipv4Config.provider
};
if ($scope.ipv4Config.provider === 'fixed') {
ipv4Config.ip = $scope.ipv4Config.ip;
} else if ($scope.ipv4Config.provider === 'network-interface') {
ipv4Config.ifname = $scope.ipv4Config.ifname;
}
var data = {
domainConfig: {
domain: $scope.dnsCredentials.domain,
@@ -240,7 +237,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
config: config,
tlsConfig: tlsConfig
},
ipv4Config: ipv4Config,
ipv4Config: $scope.ipv4Config,
ipv6Config: $scope.ipv6Config,
providerToken: $scope.instanceId,
setupToken: $scope.setupToken
};