diff --git a/box.js b/box.js index 0f8b147fd..05e6762eb 100755 --- a/box.js +++ b/box.js @@ -30,7 +30,6 @@ console.log(' Version: ', constants.VERSION); console.log(' Admin Origin: ', config.adminOrigin()); console.log(' Appstore API server origin: ', config.apiServerOrigin()); console.log(' Appstore Web server origin: ', config.webServerOrigin()); -console.log(' SysAdmin Port: ', config.get('sysadminPort')); console.log(' LDAP Server Port: ', config.get('ldapPort')); console.log(' Docker Proxy Port: ', config.get('dockerProxyPort')); console.log(); diff --git a/src/apps.js b/src/apps.js index 37cb8ce8f..3ca568332 100644 --- a/src/apps.js +++ b/src/apps.js @@ -150,7 +150,7 @@ function validatePortBindings(portBindings, manifest) { 2020, /* mail server */ 2514, /* cloudron-syslog (lo) */ config.get('port'), /* app server (lo) */ - config.get('sysadminPort'), /* sysadmin app server (lo) */ + constants.SYSADMIN_PORT, /* sysadmin app server (lo) */ config.get('smtpPort'), /* internal smtp port (lo) */ config.get('ldapPort'), /* ldap server (lo) */ 3306, /* mysql (lo) */ diff --git a/src/config.js b/src/config.js index cc805b082..dfa18a7a3 100644 --- a/src/config.js +++ b/src/config.js @@ -25,7 +25,6 @@ exports = module.exports = { // these values are derived adminOrigin: adminOrigin, internalAdminOrigin: internalAdminOrigin, - sysadminOrigin: sysadminOrigin, // localhost routes adminFqdn: adminFqdn, mailFqdn: mailFqdn, @@ -87,7 +86,6 @@ function initConfig() { data.webServerOrigin = null; data.provider = 'generic'; data.smtpPort = 2525; // this value comes from mail container - data.sysadminPort = 3001; data.ldapPort = 3002; data.dockerProxyPort = 3003; @@ -173,10 +171,6 @@ function internalAdminOrigin() { return 'http://127.0.0.1:' + get('port'); } -function sysadminOrigin() { - return 'http://127.0.0.1:' + get('sysadminPort'); -} - function database() { return get('database'); } diff --git a/src/constants.js b/src/constants.js index b8024bc85..c6cb3302c 100644 --- a/src/constants.js +++ b/src/constants.js @@ -21,6 +21,8 @@ exports = module.exports = { ADMIN_LOCATION: 'my', + SYSADMIN_PORT: 3001, + NGINX_DEFAULT_CONFIG_FILE_NAME: 'default.conf', GHOST_USER_FILE: '/tmp/cloudron_ghost.json', diff --git a/src/routes/test/sysadmin-test.js b/src/routes/test/sysadmin-test.js index 569966ecf..fecd42135 100644 --- a/src/routes/test/sysadmin-test.js +++ b/src/routes/test/sysadmin-test.js @@ -7,6 +7,7 @@ var async = require('async'), config = require('../../config.js'), + constants = require('../../constants.js'), database = require('../../database.js'), domains = require('../../domains.js'), eventlog = require('../../eventlog.js'), @@ -70,7 +71,7 @@ describe('Internal API', function () { describe('backup', function () { it('succeeds', function (done) { - superagent.post(config.sysadminOrigin() + '/api/v1/backup') + superagent.post(`http://127.0.0.1:${constants.SYSADMIN_PORT}/api/v1/backup`) .end(function (error, result) { expect(result.statusCode).to.equal(202); diff --git a/src/server.js b/src/server.js index 5b60e7bce..d67e0e97e 100644 --- a/src/server.js +++ b/src/server.js @@ -370,7 +370,7 @@ function start(callback) { database.initialize, cloudron.initialize, gHttpServer.listen.bind(gHttpServer, config.get('port'), '127.0.0.1'), - gSysadminHttpServer.listen.bind(gSysadminHttpServer, config.get('sysadminPort'), '127.0.0.1'), + gSysadminHttpServer.listen.bind(gSysadminHttpServer, constants.SYSADMIN_PORT, '127.0.0.1'), eventlog.add.bind(null, eventlog.ACTION_START, { userId: null, username: 'boot' }, { version: constants.VERSION }) ], callback); }