Commit fe1cf482 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'prep_prod' into 'master'

Prep prod

See merge request !95
parents 58fc4884 94e893cd
Pipeline #4798 passed with stage
in 8 seconds
...@@ -28,6 +28,7 @@ module.exports = { ...@@ -28,6 +28,7 @@ module.exports = {
host: 'mailhost', // hostname host: 'mailhost', // hostname
secureConnection: false, // TLS requires secureConnection to be false secureConnection: false, // TLS requires secureConnection to be false
port: 587, // port for secure SMTP port: 587, // port for secure SMTP
TLS: true, // sets requireTLS
authUser: 'mailuser', authUser: 'mailuser',
authPass: 'mailpass', authPass: 'mailpass',
tlsCiphers: 'SSLv3', tlsCiphers: 'SSLv3',
...@@ -66,6 +67,7 @@ module.exports = { ...@@ -66,6 +67,7 @@ module.exports = {
host: 'mailhost', // hostname host: 'mailhost', // hostname
secureConnection: false, // TLS requires secureConnection to be false secureConnection: false, // TLS requires secureConnection to be false
port: 587, // port for secure SMTP port: 587, // port for secure SMTP
TLS: true, // sets requireTLS
authUser: 'mailuser', authUser: 'mailuser',
authPass: 'mailpass', authPass: 'mailpass',
tlsCiphers: 'SSLv3', tlsCiphers: 'SSLv3',
......
const nodemailer = require('nodemailer') const nodemailer = require('nodemailer');
const nodemailerNTLMAuth = require('nodemailer-ntlm-auth');
var env = process.env.NODE_ENV || 'testing'; var env = process.env.NODE_ENV || 'testing';
const config = require('./config')[env] const config = require('./config')[env]
...@@ -7,9 +9,18 @@ var smtpTransport = nodemailer.createTransport({ ...@@ -7,9 +9,18 @@ var smtpTransport = nodemailer.createTransport({
host: config.mailer.host, host: config.mailer.host,
secure: config.mailer.secureConnection, secure: config.mailer.secureConnection,
port: config.mailer.port, port: config.mailer.port,
requireTLS: config.mailer.TLS,
auth: { auth: {
type: 'custom',
method: 'NTLM',
user: config.mailer.authUser, user: config.mailer.authUser,
pass: config.mailer.authPass pass: config.mailer.authPass,
options: {
domain: 'ad'
}
},
customAuth:{
NTLM: nodemailerNTLMAuth
} }
}); });
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
"mysql": "^2.17.1", "mysql": "^2.17.1",
"mysql2": "^2.2.5", "mysql2": "^2.2.5",
"nodemailer": "^6.3.1", "nodemailer": "^6.3.1",
"nodemailer-ntlm-auth": "^1.0.1",
"passport": "0.3.2", "passport": "0.3.2",
"passport-saml": "^2.1.0", "passport-saml": "^2.1.0",
"pug": "^3.0.2" "pug": "^3.0.2"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment