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

setting dashboard domain now only updates dashboard domain (and not mail)

Browse Source 
part of #721
This commit is contained in:
Girish Ramakrishnan
2020-08-15 22:53:05 -07:00
parent d1e14ed691
commit 1eef239392
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cloudron.js
View File

@@ -13,7 +13,7 @@ exports = module.exports = {
prepareDashboardDomain: prepareDashboardDomain, prepareDashboardDomain: prepareDashboardDomain,
setDashboardDomain: setDashboardDomain, setDashboardDomain: setDashboardDomain,
setDashboardAndMailDomain: setDashboardAndMailDomain, updateDashboardDomain: updateDashboardDomain,
renewCerts: renewCerts, renewCerts: renewCerts,
setupDashboard: setupDashboard, setupDashboard: setupDashboard,
@@ -317,19 +317,18 @@ function setDashboardDomain(domain, auditSource, callback) {
} }
// call this only post activation because it will restart mail server // call this only post activation because it will restart mail server
function setDashboardAndMailDomain(domain, auditSource, callback) { function updateDashboardDomain(domain, auditSource, callback) {
assert.strictEqual(typeof domain, 'string'); assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof auditSource, 'object'); assert.strictEqual(typeof auditSource, 'object');
assert.strictEqual(typeof callback, 'function'); assert.strictEqual(typeof callback, 'function');
debug(`setDashboardAndMailDomain: ${domain}`); debug(`updateDashboardDomain: ${domain}`);
if (settings.isDemo()) return callback(new BoxError(BoxError.CONFLICT, 'Not allowed in demo mode')); if (settings.isDemo()) return callback(new BoxError(BoxError.CONFLICT, 'Not allowed in demo mode'));
setDashboardDomain(domain, auditSource, function (error) { setDashboardDomain(domain, auditSource, function (error) {
if (error) return callback(error); if (error) return callback(error);
mail.onMailFqdnChanged(NOOP_CALLBACK); // this will update dns and re-configure mail server
addons.restartService('turn', NOOP_CALLBACK); // to update the realm variable addons.restartService('turn', NOOP_CALLBACK); // to update the realm variable
callback(null); callback(null);

6
src/routes/cloudron.js
View File

@@ -16,7 +16,7 @@ exports = module.exports = {
checkForUpdates: checkForUpdates, checkForUpdates: checkForUpdates,
getLogs: getLogs, getLogs: getLogs,
getLogStream: getLogStream, getLogStream: getLogStream,
setDashboardAndMailDomain: setDashboardAndMailDomain, updateDashboardDomain,
prepareDashboardDomain: prepareDashboardDomain, prepareDashboardDomain: prepareDashboardDomain,
renewCerts: renewCerts, renewCerts: renewCerts,
getServerIp: getServerIp, getServerIp: getServerIp,
@@ -274,10 +274,10 @@ function getLogStream(req, res, next) {
}); });
} }
function setDashboardAndMailDomain(req, res, next) { function updateDashboardDomain(req, res, next) {
if (!req.body.domain || typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be a string')); if (!req.body.domain || typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be a string'));
cloudron.setDashboardAndMailDomain(req.body.domain, auditSource.fromRequest(req), function (error) { cloudron.updateDashboardDomain(req.body.domain, auditSource.fromRequest(req), function (error) {
if (error) return next(BoxError.toHttpError(error)); if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(204, {})); next(new HttpSuccess(204, {}));

2
src/server.js
View File

@@ -106,7 +106,7 @@ function initializeExpressSync() {
router.get ('/api/v1/cloudron/update', token, authorizeAdmin, routes.cloudron.getUpdateInfo); router.get ('/api/v1/cloudron/update', token, authorizeAdmin, routes.cloudron.getUpdateInfo);
router.post('/api/v1/cloudron/update', json, token, authorizeAdmin, routes.cloudron.update); router.post('/api/v1/cloudron/update', json, token, authorizeAdmin, routes.cloudron.update);
router.post('/api/v1/cloudron/prepare_dashboard_domain', json, token, authorizeAdmin, routes.cloudron.prepareDashboardDomain); router.post('/api/v1/cloudron/prepare_dashboard_domain', json, token, authorizeAdmin, routes.cloudron.prepareDashboardDomain);
router.post('/api/v1/cloudron/set_dashboard_domain', json, token, authorizeAdmin, routes.cloudron.setDashboardAndMailDomain); router.post('/api/v1/cloudron/set_dashboard_domain', json, token, authorizeAdmin, routes.cloudron.updateDashboardDomain);
router.post('/api/v1/cloudron/renew_certs', json, token, authorizeAdmin, routes.cloudron.renewCerts); router.post('/api/v1/cloudron/renew_certs', json, token, authorizeAdmin, routes.cloudron.renewCerts);
router.post('/api/v1/cloudron/check_for_updates', json, token, authorizeAdmin, routes.cloudron.checkForUpdates); router.post('/api/v1/cloudron/check_for_updates', json, token, authorizeAdmin, routes.cloudron.checkForUpdates);
router.get ('/api/v1/cloudron/reboot', token, authorizeAdmin, routes.cloudron.isRebootRequired); router.get ('/api/v1/cloudron/reboot', token, authorizeAdmin, routes.cloudron.isRebootRequired);