Set default cert provider to wildcard
Change it to non-wildcard for manual/noop/wildcard dns
This commit is contained in:
+11
-1
@@ -35,6 +35,16 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
|
|||||||
(tlsProvider === 'letsencrypt-prod' || tlsProvider === 'letsencrypt-staging'));
|
(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 we migrate the api origin we have to poll the new location
|
||||||
if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
|
if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
|
||||||
|
|
||||||
@@ -83,7 +93,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
|
|||||||
provider: 'route53',
|
provider: 'route53',
|
||||||
zoneName: '',
|
zoneName: '',
|
||||||
tlsConfig: {
|
tlsConfig: {
|
||||||
provider: 'letsencrypt-prod'
|
provider: 'letsencrypt-prod-wildcard'
|
||||||
},
|
},
|
||||||
hyphenatedSubdomains: false
|
hyphenatedSubdomains: false
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-1
@@ -80,7 +80,7 @@
|
|||||||
<br/>
|
<br/>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="control-label">Domain Provider</label>
|
<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>
|
</div>
|
||||||
|
|
||||||
<!-- Route53 -->
|
<!-- Route53 -->
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="control-label">DNS API provider</label>
|
<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>
|
</div>
|
||||||
|
|
||||||
<!-- Route53 -->
|
<!-- Route53 -->
|
||||||
|
|||||||
+11
-1
@@ -120,7 +120,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
|
|||||||
hyphenatedSubdomains: false,
|
hyphenatedSubdomains: false,
|
||||||
|
|
||||||
tlsConfig: {
|
tlsConfig: {
|
||||||
provider: 'letsencrypt-prod'
|
provider: 'letsencrypt-prod-wildcard'
|
||||||
},
|
},
|
||||||
|
|
||||||
fallbackCert: {
|
fallbackCert: {
|
||||||
@@ -130,6 +130,16 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
|
|||||||
keyFileName: ''
|
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) {
|
show: function (domain) {
|
||||||
$scope.domainConfigure.reset();
|
$scope.domainConfigure.reset();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user