public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some fixes

Browse source
This commit is contained in:
Tomas Bures 2019-05-25 21:18:18 +02:00
parent 640d3c2f11
commit 1270ca71f8
13 changed files with 68 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/config/default.yaml
View file

@ -148,7 +148,7 @@ ldap:
bindUser: name@company.net
bindPassword: mySecretPassword
postfixbounce:
postfixBounce:
# Enable to allow writing Postfix bounce log to Mailtrain listener
# If enabled, tail mail.log to Mailtrain with the following command:
# tail -f -n +0 /var/log/mail.log | nc localhost 5699 -

16
server/index.js
View file

@ -38,6 +38,16 @@ if (config.title) {
process.title = config.title;
}
/*
const cleanExit = () => process.exit();
process.on('SIGINT', cleanExit); // catch ctrl-c
process.on('SIGTERM', cleanExit); // catch kill
process.on('exit', function() {
// TODO
});
*/
async function startHTTPServer(appType, appName, port) {
const app = await appBuilder.createApp(appType);
@ -99,8 +109,8 @@ async function init() {
await privilegeHelpers.ensureMailtrainDir(reportFilesDir);
await executor.spawn();
await testServer.spawn();
await verpServer.spawn();
await testServer.start();
await verpServer.start();
await builtinZoneMta.spawn();
await startHTTPServer(AppType.TRUSTED, 'trusted', trustedPort);
@ -118,7 +128,7 @@ async function init() {
triggers.start();
gdprCleanup.start();
await postfixBounceServer.spawn();
await postfixBounceServer.start();
await reportProcessor.init();

2
server/lib/executor.js
View file

@ -49,7 +49,7 @@ function spawn(callback) {
});
executorProcess.on('close', (code, signal) => {
log.info('Executor', 'Executor process exited with code %s signal %s', code, signal);
log.error('Executor', 'Executor process exited with code %s signal %s', code, signal);
});
}

12
server/services/postfix-bounce-server.js
View file

@ -83,8 +83,8 @@ async function readNextChunks() {
}
}
function spawn(callback) {
if (!config.postfixbounce.enabled) {
function start(callback) {
if (!config.postfixBounce.enabled) {
return setImmediate(callback);
}
@ -95,7 +95,7 @@ function spawn(callback) {
});
server.on('error', err => {
const port = config.postfixbounce.port;
const port = config.postfixBounce.port;
const bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port;
switch (err.code) {
@ -115,15 +115,15 @@ function spawn(callback) {
}
});
server.listen(config.postfixbounce.port, config.postfixbounce.host, () => {
server.listen(config.postfixBounce.port, config.postfixBounce.host, () => {
if (started) {
return server.close();
}
started = true;
log.info('POSTFIXBOUNCE', 'Server listening on port %s', config.postfixbounce.port);
log.info('POSTFIXBOUNCE', 'Server listening on port %s', config.postfixBounce.port);
setImmediate(callback);
});
}
module.exports.spawn = bluebird.promisify(spawn);
module.exports.start = bluebird.promisify(start);

4
server/services/test-server.js
View file

@ -166,7 +166,7 @@ mailBoxServer.on('error', err => {
log.error('Test SMTP Mailbox Server', err);
});
function spawn(callback) {
function start(callback) {
if (config.testServer.enabled) {
server.listen(config.testServer.port, config.testServer.host, () => {
log.info('Test SMTP', 'Server listening on port %s', config.testServer.port);
@ -194,4 +194,4 @@ function spawn(callback) {
}
}
module.exports.spawn = bluebird.promisify(spawn);
module.exports.start = bluebird.promisify(start);

5
server/services/tzupdate.js
View file

@ -48,7 +48,4 @@ function start() {
lastCheck = curUtcDate;
}
module.exports = {
start
};
module.exports.start = start;

4
server/services/verp-server.js
View file

@ -86,7 +86,7 @@ const server = new SMTPServer({
onData: onData
});
function spawn(callback) {
function start(callback) {
if (!config.verp.enabled) {
return setImmediate(callback);
}
@ -145,4 +145,4 @@ function spawn(callback) {
startNextHost();
}
module.exports.spawn = bluebird.promisify(spawn);
module.exports.start = bluebird.promisify(start);

36
server/setup/adduser.sh
View file

@ -1,36 +0,0 @@
#!/bin/bash
# This installation script works on Ubuntu 14.04 and 16.04
# Run as root!
if [[ $EUID -ne 0 ]]; then
echo "This script must be run as root" 1>&2
exit 1
fi
set -e
export DEBIAN_FRONTEND=noninteractive
# Setup MySQL user for Mailtrain
mysql -u root --password="$ROOT_PASS" -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
mysql -u root --password="$ROOT_PASS" -e "GRANT ALL PRIVILEGES ON '$DB_USER'.* TO '$DB_USER'@'localhost';"
mysql -u "$DB_USER" --password="$DB_PASS" -e "CREATE database $DB_USER;"
mysql -u "$DB_USER" -p"$DB_PASS" "$DB_USER" < setup/sql/mailtrain.sql
mysql -u mailtrain -p"$MYSQL_PASSWORD" mailtrain <<EOT
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('admin_email','admin@$HOSTNAME') ON DUPLICATE KEY UPDATE \`value\`='admin@$HOSTNAME';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('default_address','admin@$HOSTNAME') ON DUPLICATE KEY UPDATE \`value\`='admin@$HOSTNAME';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('smtp_hostname','localhost') ON DUPLICATE KEY UPDATE \`value\`='localhost';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('smtp_disable_auth','') ON DUPLICATE KEY UPDATE \`value\`='';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('smtp_user','mailtrain') ON DUPLICATE KEY UPDATE \`value\`='mailtrain';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('smtp_pass','$SMTP_PASS') ON DUPLICATE KEY UPDATE \`value\`='$SMTP_PASS';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('smtp_encryption','NONE') ON DUPLICATE KEY UPDATE \`value\`='NONE';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('smtp_port','2525') ON DUPLICATE KEY UPDATE \`value\`='2525';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('default_homepage','http://$HOSTNAME/') ON DUPLICATE KEY UPDATE \`value\`='http://$HOSTNAME/';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('service_url','http://$HOSTNAME/') ON DUPLICATE KEY UPDATE \`value\`='http://$HOSTNAME/';
INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('dkim_api_key','$DKIM_API_KEY') ON DUPLICATE KEY UPDATE \`value\`='$DKIM_API_KEY';
EOT
echo "OK"

2
server/setup/fakedata.js
View file

@ -1,7 +1,7 @@
'use strict';
let faker = require('faker');
let accounts = 100 * 1000;
let accounts = 1000 * 1000;
let row = 0;
let getNext = () => {