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

If we already have a domain set, directly wait for dns

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-06 10:54:56 +01:00
parent 6c5fb67b58
commit 9be5f5d837
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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