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

pass env=dev as search param to set the tlsConfig

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-31 20:51:25 -08:00
parent 182085d3f8
commit f51c2e7b61
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webadmin/src/js/client.js
View File

@@ -685,13 +685,14 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
}).error(defaultErrorHandler(callback));
};
Client.prototype.setupDnsConfig = function (domain, zoneName, provider, dnsConfig, callback) {
Client.prototype.setupDnsConfig = function (domain, zoneName, provider, dnsConfig, tlsConfig, callback) {
var data = {
domain: domain,
adminFqdn: 'my.' + domain,
zoneName: zoneName,
provider: provider,
config: dnsConfig
config: dnsConfig,
tlsConfig: tlsConfig
};
post('/api/v1/cloudron/dns_setup', data).success(function(data, status) {
@@ -1129,11 +1130,12 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
}).error(defaultErrorHandler(callback)); // this doesn't call defaultErrorHandler till we fix domains code to use this directly
};
Client.prototype.addDomain = function (domain, provider, config, fallbackCertificate, callback) {
Client.prototype.addDomain = function (domain, provider, config, fallbackCertificate, tlsConfig, callback) {
var data = {
domain: domain,
provider: provider,
config: config
config: config,
tlsConfig: tlsConfig
};
var that = this;
@@ -1147,10 +1149,11 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
}).error(defaultErrorHandler(callback));
};
Client.prototype.updateDomain = function (domain, provider, config, fallbackCertificate, callback) {
Client.prototype.updateDomain = function (domain, provider, config, fallbackCertificate, tlsConfig, callback) {
var data = {
provider: provider,
config: config
config: config,
tlsConfig: tlsConfig
};
if (fallbackCertificate) data.fallbackCertificate = fallbackCertificate;

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

@@ -22,6 +22,9 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
$scope.explicitZone = search.zone || '';
$scope.isDomain = false;
$scope.isSubdomain = false;
$scope.tlsConfig = {
provider: search.env === 'dev' ? 'letsencrypt-staging' : 'letsencrypt-prod'
};
// If we migrate the api origin we have to poll the new location
if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
@@ -122,7 +125,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
data.token = $scope.dnsCredentials.cloudflareToken;
}
Client.setupDnsConfig($scope.dnsCredentials.domain, $scope.explicitZone, provider, data, function (error) {
Client.setupDnsConfig($scope.dnsCredentials.domain, $scope.explicitZone, provider, data, $scope.tlsConfig, function (error) {
if (error && error.statusCode === 403) {
$scope.dnsCredentials.busy = false;
$scope.error = 'Wrong instance id provided.';

7
webadmin/src/views/domains.js
View File

@@ -7,6 +7,9 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
$scope.dnsConfig = null;
$scope.domains = [];
$scope.ready = false;
$scope.tlsConfig = {
provider: $location.search().env === 'dev' ? 'letsencrypt-staging' : 'letsencrypt-prod'
};
// keep in sync with setupdns.js
$scope.dnsProvider = [
@@ -141,8 +144,8 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
// choose the right api, since we reuse this for adding and configuring domains
var func;
if ($scope.domainConfigure.adding) func = Client.addDomain.bind(Client, $scope.domainConfigure.newDomain, provider, data, fallbackCertificate);
else func = Client.updateDomain.bind(Client, $scope.domainConfigure.domain.domain, provider, data, fallbackCertificate);
if ($scope.domainConfigure.adding) func = Client.addDomain.bind(Client, $scope.domainConfigure.newDomain, provider, data, fallbackCertificate, $scope.tlsConfig);
else func = Client.updateDomain.bind(Client, $scope.domainConfigure.domain.domain, provider, data, fallbackCertificate, $scope.tlsConfig);
func(function (error) {
$scope.domainConfigure.busy = false;