diff --git a/src/routes/services.js b/src/routes/services.js index b9acdb007..2e82b6c25 100644 --- a/src/routes/services.js +++ b/src/routes/services.js @@ -1,12 +1,12 @@ 'use strict'; exports = module.exports = { - getAll: getAll, - get: get, - configure: configure, - getLogs: getLogs, - getLogStream: getLogStream, - restart: restart + getAll, + get, + configure, + getLogs, + getLogStream, + restart }; var addons = require('../addons.js'), diff --git a/src/routes/settings.js b/src/routes/settings.js index b4a6cbd19..36132f410 100644 --- a/src/routes/settings.js +++ b/src/routes/settings.js @@ -116,32 +116,6 @@ function setBackupConfig(req, res, next) { }); } -function getPlatformConfig(req, res, next) { - settings.getPlatformConfig(function (error, config) { - if (error) return next(BoxError.toHttpError(error)); - - next(new HttpSuccess(200, config)); - }); -} - -function setPlatformConfig(req, res, next) { - assert.strictEqual(typeof req.body, 'object'); - - for (let addon of [ 'mysql', 'postgresql', 'mail', 'mongodb' ]) { - if (!(addon in req.body)) continue; - if (typeof req.body[addon] !== 'object') return next(new HttpError(400, 'addon config must be an object')); - - if (typeof req.body[addon].memory !== 'number') return next(new HttpError(400, 'memory must be a number')); - if (typeof req.body[addon].memorySwap !== 'number') return next(new HttpError(400, 'memorySwap must be a number')); - } - - settings.setPlatformConfig(req.body, function (error) { - if (error) return next(BoxError.toHttpError(error)); - - next(new HttpSuccess(200, {})); - }); -} - function getExternalLdapConfig(req, res, next) { settings.getExternalLdapConfig(function (error, config) { if (error) return next(BoxError.toHttpError(error)); @@ -299,7 +273,6 @@ function get(req, res, next) { switch (req.params.setting) { case settings.DYNAMIC_DNS_KEY: return getDynamicDnsConfig(req, res, next); case settings.BACKUP_CONFIG_KEY: return getBackupConfig(req, res, next); - case settings.PLATFORM_CONFIG_KEY: return getPlatformConfig(req, res, next); case settings.EXTERNAL_LDAP_KEY: return getExternalLdapConfig(req, res, next); case settings.UNSTABLE_APPS_KEY: return getUnstableAppsConfig(req, res, next); case settings.REGISTRY_CONFIG_KEY: return getRegistryConfig(req, res, next); @@ -321,7 +294,6 @@ function set(req, res, next) { switch (req.params.setting) { case settings.DYNAMIC_DNS_KEY: return setDynamicDnsConfig(req, res, next); - case settings.PLATFORM_CONFIG_KEY: return setPlatformConfig(req, res, next); case settings.EXTERNAL_LDAP_KEY: return setExternalLdapConfig(req, res, next); case settings.UNSTABLE_APPS_KEY: return setUnstableAppsConfig(req, res, next); case settings.REGISTRY_CONFIG_KEY: return setRegistryConfig(req, res, next); diff --git a/src/server.js b/src/server.js index 0b5e274c1..24d761e6c 100644 --- a/src/server.js +++ b/src/server.js @@ -312,7 +312,7 @@ function initializeExpressSync() { router.del ('/api/v1/volumes/:id', token, authorizeAdmin, routes.volumes.load, routes.volumes.del); router.use ('/api/v1/volumes/:id/files/*', token, authorizeAdmin, routes.filemanager.proxy); - // addon routes + // service routes router.get ('/api/v1/services', token, authorizeAdmin, routes.services.getAll); router.get ('/api/v1/services/:service', token, authorizeAdmin, routes.services.get); router.post('/api/v1/services/:service', json, token, authorizeAdmin, routes.services.configure);