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

Set default cert provider to wildcard

Browse Source 
Change it to non-wildcard for manual/noop/wildcard dns
This commit is contained in:
Girish Ramakrishnan
2018-09-26 18:16:21 -07:00
parent ee1a194305
commit dfa4e20a8f
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/setupdns.js
View File

@@ -35,6 +35,16 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
(tlsProvider === 'letsencrypt-prod' || tlsProvider === 'letsencrypt-staging'));
};
$scope.setDefaultTlsProvider = function () {
var dnsProvider = $scope.domainConfigure.provider;
// wildcard LE won't work without automated DNS
if ((dnsProvider === 'manual' || dnsProvider === 'noop' || dnsProvider === 'wildcard')) {
$scope.domainConfigure.tlsProvider.provider = 'letsencrypt-prod';
} else {
$scope.domainConfigure.tlsProvider.provider = 'letsencrypt-prod-wildcard';
}
};
// If we migrate the api origin we have to poll the new location
if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
@@ -83,7 +93,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
provider: 'route53',
zoneName: '',
tlsConfig: {
provider: 'letsencrypt-prod'
provider: 'letsencrypt-prod-wildcard'
},
hyphenatedSubdomains: false
};

2
src/setupdns.html
View File

@@ -80,7 +80,7 @@
<br/>
<div class="form-group">
<label class="control-label">Domain Provider</label>
<select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider" ng-disabled="dnsCredentials.busy"></select>
<select class="form-control" ng-model="dnsCredentials.provider" ng-options="a.value as a.name for a in dnsProvider" ng-disabled="dnsCredentials.busy" ng-change="setDefaultTlsProvider()"></select>
</div>
<!-- Route53 -->

2
src/views/domains.html
View File

@@ -17,7 +17,7 @@
<div class="form-group">
<label class="control-label">DNS API provider</label>
<select class="form-control" ng-model="domainConfigure.provider" ng-options="a.value as a.name for a in dnsProvider"></select>
<select class="form-control" ng-model="domainConfigure.provider" ng-options="a.value as a.name for a in dnsProvider" ng-change="domainConfigure.setDefaultTlsProvider()"></select>
</div>
<!-- Route53 -->

12
src/views/domains.js
View File

@@ -120,7 +120,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
hyphenatedSubdomains: false,
tlsConfig: {
provider: 'letsencrypt-prod'
provider: 'letsencrypt-prod-wildcard'
},
fallbackCert: {
@@ -130,6 +130,16 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
keyFileName: ''
},
setDefaultTlsProvider: function () {
var dnsProvider = $scope.domainConfigure.provider;
// wildcard LE won't work without automated DNS
if (dnsProvider === 'manual' || dnsProvider === 'noop' || dnsProvider === 'wildcard') {
$scope.domainConfigure.tlsConfig.provider = 'letsencrypt-prod';
} else {
$scope.domainConfigure.tlsConfig.provider = 'letsencrypt-prod-wildcard';
}
},
show: function (domain) {
$scope.domainConfigure.reset();