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

Make box come up regardless of dns config

Browse Source 
Part of #302
This commit is contained in:
Girish Ramakrishnan
2017-04-25 15:18:09 -07:00
parent 923e1d0524
commit ddf7823b19
4 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webadmin/src/js/main.js
View File

@@ -109,8 +109,8 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
// 4. local development with gulp develop
if (!status.activated) {
console.log('You have on domain, redirecting', status.configState.configured);
window.location.href = status.configState.configured ? '/setup.html' : '/setupdns.html';
console.log('Not activated yet, redirecting', status);
window.location.href = status.adminFqdn ? '/setup.html' : '/setupdns.html';
return;
}

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

@@ -70,7 +70,7 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', 'ngTld', func
$scope.busy = true;
Client.getStatus(function (error, status) {
if (!error && status.adminFqdn && status.configState.dns && status.configState.tls) {
if (!error && status.adminFqdn && status.webadminStatus.dns && status.webadminStatus.tls) {
window.location.href = 'https://' + status.adminFqdn + '/setup.html';
}