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

Use new setup route

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-10-30 13:42:57 -07:00
parent cb90ad803b
commit 5d57a5fabb
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/client.js
View File

@@ -779,17 +779,18 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
}).error(defaultErrorHandler(callback));
};
Client.prototype.setupDnsConfig = function (domain, zoneName, provider, dnsConfig, tlsConfig, callback) {
Client.prototype.setup = function (domain, zoneName, provider, config, tlsConfig, callback) {
var data = {
domain: domain,
adminFqdn: 'my' + (dnsConfig.hyphenatedSubdomains ? '-' : '.' ) + domain,
zoneName: zoneName,
provider: provider,
config: dnsConfig,
tlsConfig: tlsConfig
dnsConfig: {
domain: domain,
zoneName: zoneName,
provider: provider,
config: config,
tlsConfig: tlsConfig
}
};
post('/api/v1/cloudron/dns_setup', data).success(function(data, status) {
post('/api/v1/cloudron/setup', data).success(function(data, status) {
if (status !== 200) return callback(new ClientError(status, data));
callback(null);
}).error(defaultErrorHandler(callback));

2
src/js/setupdns.js
View File

@@ -173,7 +173,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
tlsConfig.wildcard = true;
}
Client.setupDnsConfig($scope.dnsCredentials.domain, $scope.dnsCredentials.zoneName, provider, data, tlsConfig, function (error) {
Client.setup($scope.dnsCredentials.domain, $scope.dnsCredentials.zoneName, provider, data, tlsConfig, function (error) {
if (error && error.statusCode === 401) {
$scope.dnsCredentials.busy = false;
$scope.error = 'Wrong instance id provided.';