diff --git a/src/js/setupdns.js b/src/js/setupdns.js index 0834aadbc..678b8b3e2 100644 --- a/src/js/setupdns.js +++ b/src/js/setupdns.js @@ -111,12 +111,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f hyphenatedSubdomains: $scope.dnsCredentials.hyphenatedSubdomains }; - // special case the wildcard provider - if (provider === 'wildcard') { - provider = 'manual'; - data.wildcard = true; - } - if (provider === 'route53') { data.accessKeyId = $scope.dnsCredentials.accessKeyId; data.secretAccessKey = $scope.dnsCredentials.secretAccessKey; diff --git a/src/views/apps.html b/src/views/apps.html index 2b54d737b..6a28fc648 100644 --- a/src/views/apps.html +++ b/src/views/apps.html @@ -34,7 +34,7 @@ -

+

Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP

@@ -277,7 +277,7 @@ -

+

Add an A record manually for {{ appRestore.location }} to this Cloudron's public IP

diff --git a/src/views/appstore.html b/src/views/appstore.html index d907046f6..614c20909 100644 --- a/src/views/appstore.html +++ b/src/views/appstore.html @@ -37,7 +37,7 @@ -

+

Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP

diff --git a/src/views/domains.js b/src/views/domains.js index 4ac30aae6..a2b007fe8 100644 --- a/src/views/domains.js +++ b/src/views/domains.js @@ -38,7 +38,8 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat case 'namecom': return 'Name.com'; case 'gcdns': return 'Google Cloud'; case 'godaddy': return 'GoDaddy'; - case 'manual': return domain.config.wildcard ? 'Wildcard' : 'Manual'; + case 'manual': return 'Manual'; + case 'wildcard': return 'Wildcard'; case 'noop': return 'No-op'; default: return 'Unknown'; } @@ -150,7 +151,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat $scope.domainConfigure.nameComUsername = domain.provider === 'namecom' ? domain.config.username : ''; $scope.domainConfigure.provider = domain.provider; - $scope.domainConfigure.provider = ($scope.domainConfigure.provider === 'manual' && domain.config.wildcard) ? 'wildcard' : domain.provider; $scope.domainConfigure.tlsConfig.provider = domain.tlsConfig.provider; $scope.domainConfigure.zoneName = domain.zoneName; @@ -171,12 +171,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat var data = {}; - // special case the wildcard provider - if (provider === 'wildcard') { - provider = 'manual'; - data.wildcard = true; - } - if (provider === 'route53') { data.accessKeyId = $scope.domainConfigure.accessKeyId; data.secretAccessKey = $scope.domainConfigure.secretAccessKey;