Allow starting as root and downgrading once the server is listening

This commit is contained in:
Andris Reinman 2016-04-15 21:40:59 -07:00
parent b444440d65
commit b7e943d90e
8 changed files with 79 additions and 17 deletions

View file

@ -1,4 +1,12 @@
# If you start out as a root user (eg. if you want to use ports lower than 1000)
# then you can downgrade the user once all services are up and running
#user="nobody"
#group="nogroup"
# Process title visible in monitorin logs and process listing
title="mailtrain"
[log] [log]
level="silly" level="silly"

View file

@ -8,10 +8,18 @@ let config = require('config');
let log = require('npmlog'); let log = require('npmlog');
let app = require('./app'); let app = require('./app');
let http = require('http'); let http = require('http');
let sender = require('./services/sender');
let importer = require('./services/importer'); // eslint-disable-line global-require
let verpServer = require('./services/verp-server'); // eslint-disable-line global-require
let testServer = require('./services/test-server'); // eslint-disable-line global-require
let port = config.www.port; let port = config.www.port;
let host = config.www.host; let host = config.www.host;
if (config.title) {
process.title = config.title;
}
log.level = config.log.level; log.level = config.log.level;
app.set('port', port); app.set('port', port);
@ -54,9 +62,30 @@ server.on('listening', () => {
let bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port; let bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port;
log.info('Express', 'WWW server listening on %s', bind); log.info('Express', 'WWW server listening on %s', bind);
// start sending loop // start additional services
require('./services/sender'); // eslint-disable-line global-require testServer(() => {
require('./services/importer'); // eslint-disable-line global-require verpServer(() => {
require('./services/verp-server'); // eslint-disable-line global-require importer(() => {
require('./services/test-server'); // eslint-disable-line global-require sender(() => {
log.info('Service', 'All services started');
if (config.group) {
try {
process.setgid(config.group);
log.info('Service', 'Changed group to "%s" (%s)', config.group, process.getgid());
} catch (E) {
log.info('Service', 'Failed changed group to "%s"', config.group);
}
}
if (config.user) {
try {
process.setuid(config.user);
log.info('Service', 'Changed user to "%s" (%s)', config.user, process.getuid());
} catch (E) {
log.info('Service', 'Failed changed user to "%s"', config.user);
}
}
});
});
});
});
}); });

View file

@ -102,3 +102,10 @@ $('.fm-birthday-generic.date').datepicker({
weekStart: 1, weekStart: 1,
autoclose: true autoclose: true
}); });
$('.page-refresh').each(function () {
var interval = Number($(this).data('interval')) || 60;
setTimeout(function () {
window.location.reload();
}, interval * 1000);
});

View file

@ -234,4 +234,7 @@ let importLoop = () => {
getNext(); getNext();
}; };
importLoop(); module.exports = callback => {
importLoop();
setImmediate(callback);
};

View file

@ -294,4 +294,7 @@ let sendLoop = () => {
}); });
}; };
sendLoop(); module.exports = callback => {
sendLoop();
setImmediate(callback);
};

View file

@ -96,8 +96,13 @@ server.on('error', err => {
log.error('TESTSERV', err.stack); log.error('TESTSERV', err.stack);
}); });
if (config.testserver.enabled) { module.exports = callback => {
if (config.testserver.enabled) {
server.listen(config.testserver.port, config.testserver.host, () => { server.listen(config.testserver.port, config.testserver.host, () => {
log.info('TESTSERV', 'Server listening on port %s', config.testserver.port); log.info('TESTSERV', 'Server listening on port %s', config.testserver.port);
setImmediate(callback);
}); });
} } else {
setImmediate(callback);
}
};

View file

@ -96,8 +96,13 @@ server.on('error', err => {
log.error('VERP', err.stack); log.error('VERP', err.stack);
}); });
if (config.verp.enabled) { module.exports = callback => {
if (config.verp.enabled) {
server.listen(config.verp.port, () => { server.listen(config.verp.port, () => {
log.info('VERP', 'Server listening on port %s', config.verp.port); log.info('VERP', 'Server listening on port %s', config.verp.port);
setImmediate(callback);
}); });
} } else {
setImmediate(callback);
}
};

View file

@ -99,6 +99,8 @@
{{/if}} {{/if}}
{{#if isSending}} {{#if isSending}}
<!-- Indicate that this page needs refreshing after 20s. -->
<div class="page-refresh" data-interval="20"></div>
<div class="pull-right"> <div class="pull-right">
<form class="form-horizontal" method="post" action="/campaigns/pause"> <form class="form-horizontal" method="post" action="/campaigns/pause">
<input type="hidden" name="_csrf" value="{{csrfToken}}"> <input type="hidden" name="_csrf" value="{{csrfToken}}">