diff --git a/docs/references/api.md b/docs/references/api.md index 2c45622c8..f024e05c4 100644 --- a/docs/references/api.md +++ b/docs/references/api.md @@ -790,7 +790,6 @@ Response (200): { apiServerOrigin: , // Always https://api.cloudron.io webServerOrigin: , // Always https://cloudron.io - isDev: , // internal fqdn: , // The FQDN ip: , // The public IP version: , // Current version diff --git a/src/certificates.js b/src/certificates.js index c7e76529d..e07c9333c 100644 --- a/src/certificates.js +++ b/src/certificates.js @@ -96,7 +96,7 @@ function getApi(app, callback) { var options = { }; if (tlsConfig.provider === 'caas') { - options.prod = !config.isDev(); // with altDomain, we will choose acme setting based on this + options.prod = true; // with altDomain, we will choose acme setting based on this } else { // acme options.prod = tlsConfig.provider.match(/.*-prod/) !== null; } diff --git a/src/cloudron.js b/src/cloudron.js index cc2f4377e..e5ad06927 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -442,7 +442,6 @@ function getConfig(callback) { callback(null, { apiServerOrigin: config.apiServerOrigin(), webServerOrigin: config.webServerOrigin(), - isDev: config.isDev(), fqdn: config.fqdn(), version: config.version(), update: updateChecker.getUpdateInfo(), diff --git a/src/config.js b/src/config.js index 5cdf991a9..35b0dc05a 100644 --- a/src/config.js +++ b/src/config.js @@ -32,7 +32,6 @@ exports = module.exports = { appFqdn: appFqdn, zoneName: zoneName, - isDev: isDev, isDemo: isDemo, tlsCert: tlsCert, @@ -204,10 +203,6 @@ function database() { return get('database'); } -function isDev() { - return /dev/i.test(get('boxVersionsUrl')); -} - function isDemo() { return get('isDemo') === true; } diff --git a/src/test/certificates-test.js b/src/test/certificates-test.js index 907301009..b0e7c2c06 100644 --- a/src/test/certificates-test.js +++ b/src/test/certificates-test.js @@ -125,13 +125,13 @@ describe('Certificates', function () { }); }); - it('returns non-prod caas for dev cloudron', function (done) { + it('returns prod caas for dev cloudron', function (done) { config.set('boxVersionsUrl', 'http://dev/release.json'); certificates._getApi({ }, function (error, api, options) { expect(error).to.be(null); expect(api._name).to.be('caas'); - expect(options.prod).to.be(false); + expect(options.prod).to.be(true); done(); }); }); @@ -147,13 +147,13 @@ describe('Certificates', function () { }); }); - it('returns non-prod acme with altDomain in dev cloudron', function (done) { + it('returns prod acme with altDomain in dev cloudron', function (done) { config.set('boxVersionsUrl', 'http://dev/release.json'); certificates._getApi({ altDomain: 'foo.something.com' }, function (error, api, options) { expect(error).to.be(null); expect(api._name).to.be('acme'); - expect(options.prod).to.be(false); + expect(options.prod).to.be(true); done(); }); }); diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js index 0409ac925..8ce79ffd3 100644 --- a/webadmin/src/js/client.js +++ b/webadmin/src/js/client.js @@ -110,7 +110,6 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification', ip: null, revision: null, update: { box: null, apps: null }, - isDev: false, progress: {}, isCustomDomain: false, region: null, diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html index e2b0c6751..e5faf1628 100644 --- a/webadmin/src/views/appstore.html +++ b/webadmin/src/views/appstore.html @@ -140,7 +140,7 @@ - + diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html index d966432ee..156520c32 100644 --- a/webadmin/src/views/settings.html +++ b/webadmin/src/views/settings.html @@ -354,7 +354,7 @@
-
+
Provider
@@ -362,7 +362,7 @@ {{ backupConfig.provider === 'caas' ? 'cloudron.io' : backupConfig.provider }}
-
+
Location
@@ -384,7 +384,7 @@
-
+

@@ -393,7 +393,7 @@
-
+

{{ createBackup.message }}