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

Added option to set default options for nodemailer

Browse source
This commit is contained in:
Andris Reinman 2016-12-07 21:39:36 +02:00
parent 57c6e0ae79
commit 170b60f9a0
3 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/default.toml
View file

@ -105,3 +105,7 @@ enabled=false
port=5699 port=5699
# allow connections from localhost only # allow connections from localhost only
host="127.0.0.1" host="127.0.0.1"
# extra options for nodemailer
[nodemailer]
#textEncoding="base64"

4
lib/mailer.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
let log = require('npmlog'); let log = require('npmlog');
let config = require('config');
let nodemailer = require('nodemailer'); let nodemailer = require('nodemailer');
let openpgpEncrypt = require('nodemailer-openpgp').openpgpEncrypt; let openpgpEncrypt = require('nodemailer-openpgp').openpgpEncrypt;
let settings = require('./models/settings'); let settings = require('./models/settings');
@ -155,7 +155,7 @@ function createMailer(callback) {
tls: { tls: {
rejectUnauthorized: !configItems.smtpSelfSigned rejectUnauthorized: !configItems.smtpSelfSigned
} }
}); }, config.nodemailer);
module.exports.transport.use('stream', openpgpEncrypt({ module.exports.transport.use('stream', openpgpEncrypt({
signingKey: configItems.pgpPrivateKey, signingKey: configItems.pgpPrivateKey,
passphrase: configItems.pgpPassphrase passphrase: configItems.pgpPassphrase

36
setup/adduser.sh Normal file
View file

@ -0,0 +1,36 @@
#!/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"