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

wildcard dns is now a provider

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-09-06 19:49:20 -07:00
parent aa0a4ae3e9
commit 184ad3bc4e
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/setupdns.js
-6
View File
@@ -111,12 +111,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
hyphenatedSubdomains: $scope.dnsCredentials.hyphenatedSubdomains hyphenatedSubdomains: $scope.dnsCredentials.hyphenatedSubdomains
}; };
// special case the wildcard provider
if (provider === 'wildcard') {
provider = 'manual';
data.wildcard = true;
}
if (provider === 'route53') { if (provider === 'route53') {
data.accessKeyId = $scope.dnsCredentials.accessKeyId; data.accessKeyId = $scope.dnsCredentials.accessKeyId;
data.secretAccessKey = $scope.dnsCredentials.secretAccessKey; data.secretAccessKey = $scope.dnsCredentials.secretAccessKey;
src/views/apps.html
+2 -2
View File
@@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<p class="text-center" ng-show="appConfigure.location && appConfigure.domain.provider === 'manual' && !appConfigure.domain.config.wildcard"> <p class="text-center" ng-show="appConfigure.location && appConfigure.domain.provider === 'manual'">
<b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b> <b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b>
<br> <br>
</p> </p>
@@ -277,7 +277,7 @@
</div> </div>
</div> </div>
<p class="text-center" ng-show="appRestore.location && appRestore.domain.provider === 'manual' && !appRestore.domain.config.wildcard"> <p class="text-center" ng-show="appRestore.location && appRestore.domain.provider === 'manual'">
<b>Add an A record manually for {{ appRestore.location }} to this Cloudron's public IP</b> <b>Add an A record manually for {{ appRestore.location }} to this Cloudron's public IP</b>
<br> <br>
</p> </p>
src/views/appstore.html
+1 -1
View File
@@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<p class="text-center" ng-show="appInstall.location && appInstall.domain.provider === 'manual' && !appInstall.domain.config.wildcard"> <p class="text-center" ng-show="appInstall.location && appInstall.domain.provider === 'manual'">
<b>Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP</b> <b>Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP</b>
<br> <br>
</p> </p>
src/views/domains.js
+2 -8
View File
@@ -38,7 +38,8 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
case 'namecom': return 'Name.com'; case 'namecom': return 'Name.com';
case 'gcdns': return 'Google Cloud'; case 'gcdns': return 'Google Cloud';
case 'godaddy': return 'GoDaddy'; 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'; case 'noop': return 'No-op';
default: return 'Unknown'; 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.nameComUsername = domain.provider === 'namecom' ? domain.config.username : '';
$scope.domainConfigure.provider = domain.provider; $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.tlsConfig.provider = domain.tlsConfig.provider;
$scope.domainConfigure.zoneName = domain.zoneName; $scope.domainConfigure.zoneName = domain.zoneName;
@@ -171,12 +171,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
var data = {}; var data = {};
// special case the wildcard provider
if (provider === 'wildcard') {
provider = 'manual';
data.wildcard = true;
}
if (provider === 'route53') { if (provider === 'route53') {
data.accessKeyId = $scope.domainConfigure.accessKeyId; data.accessKeyId = $scope.domainConfigure.accessKeyId;
data.secretAccessKey = $scope.domainConfigure.secretAccessKey; data.secretAccessKey = $scope.domainConfigure.secretAccessKey;