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

rename sysinfo to ipv4Config

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-04-25 19:15:19 +02:00
parent 9efcd9060e
commit 017e46fa0f
4 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/js/restore.js
+11 -10
View File
@@ -55,13 +55,14 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
$scope.mountOptions.diskPath = '/dev/disk/by-uuid/' + newValue.uuid;
});
$scope.sysinfo = {
$scope.ipv4Config = {
provider: 'generic',
ipv4: '',
ip: '',
ifname: ''
};
$scope.sysinfoProvider = [
$scope.ipv4Providers = [
{ name: 'Disabled', value: 'noop' },
{ name: 'Public IP', value: 'generic' },
{ name: 'Static IP Address', value: 'fixed' },
{ name: 'Network Interface', value: 'network-interface' }
@@ -224,16 +225,16 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
return;
}
var sysinfoConfig = {
provider: $scope.sysinfo.provider
var ipv4Config = {
provider: $scope.ipv4Config.provider
};
if ($scope.sysinfo.provider === 'fixed') {
sysinfoConfig.ip = $scope.sysinfo.ipv4;
} else if ($scope.sysinfo.provider === 'network-interface') {
sysinfoConfig.ifname = $scope.sysinfo.ifname;
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] : '', sysinfoConfig, $scope.skipDnsSetup, $scope.setupToken, function (error) {
Client.restore(backupConfig, $scope.remotePath.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', ipv4Config, $scope.skipDnsSetup, $scope.setupToken, function (error) {
$scope.busy = false;
if (error) {
dashboard/src/js/setupdns.js
+10 -10
View File
@@ -26,13 +26,13 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
{ name: 'Self-Signed', value: 'fallback' }, // this is not 'Custom' because we don't allow user to upload certs during setup phase
];
$scope.sysinfo = {
$scope.ipv4Config = {
provider: 'generic',
ipv4: '',
ip: '',
ifname: ''
};
$scope.sysinfoProvider = [
$scope.ipv4Providers = [
{ name: 'Disabled', value: 'noop' },
{ name: 'Public IP', value: 'generic' },
{ name: 'Static IP Address', value: 'fixed' },
@@ -223,13 +223,13 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
tlsConfig.wildcard = true;
}
var sysinfoConfig = {
provider: $scope.sysinfo.provider
var ipv4Config = {
provider: $scope.ipv4Config.provider
};
if ($scope.sysinfo.provider === 'fixed') {
sysinfoConfig.ip = $scope.sysinfo.ipv4;
} else if ($scope.sysinfo.provider === 'network-interface') {
sysinfoConfig.ifname = $scope.sysinfo.ifname;
if ($scope.ipv4Config.provider === 'fixed') {
ipv4Config.ip = $scope.ipv4Config.ip;
} else if ($scope.ipv4Config.provider === 'network-interface') {
ipv4Config.ifname = $scope.ipv4Config.ifname;
}
var data = {
@@ -240,7 +240,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
config: config,
tlsConfig: tlsConfig
},
ipv4Config: sysinfoConfig,
ipv4Config: ipv4Config,
providerToken: $scope.instanceId,
setupToken: $scope.setupToken
};