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

Remove configStatus.domain and replace with toplevel adminFqdn

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-10 22:19:41 +01:00
parent eb057fb399
commit 349c261238
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/js/setupdns.js
View File

@@ -59,8 +59,8 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
$scope.busy = true;
Client.getStatus(function (error, status) {
if (!error && status.configState.domain && status.configState.dns && status.configState.tls) {
window.location.href = 'https://my.' + status.configState.domain + '/setup.html';
if (!error && status.adminFqdn && status.configState.dns && status.configState.tls) {
window.location.href = 'https://my.' + status.adminFqdn + '/setup.html';
}
setTimeout(waitForDnsSetup, 5000);
@@ -74,7 +74,7 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
}
// domain is currently like a lock flag
if (status.configState.domain) return waitForDnsSetup();
if (status.adminFqdn) return waitForDnsSetup();
if (status.provider === 'digitalocean') $scope.dnsCredentials.provider = 'digitalocean';