if (this.initialized === true) return
this.initialized = true
- if (isEmailEnabled()) {
- if (CONFIG.SMTP.TRANSPORT === 'smtp') {
- logger.info('Using %s:%s as SMTP server.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT)
-
- let tls
- if (CONFIG.SMTP.CA_FILE) {
- tls = {
- ca: [ readFileSync(CONFIG.SMTP.CA_FILE) ]
- }
- }
-
- let auth
- if (CONFIG.SMTP.USERNAME && CONFIG.SMTP.PASSWORD) {
- auth = {
- user: CONFIG.SMTP.USERNAME,
- pass: CONFIG.SMTP.PASSWORD
- }
- }
-
- this.transporter = createTransport({
- host: CONFIG.SMTP.HOSTNAME,
- port: CONFIG.SMTP.PORT,
- secure: CONFIG.SMTP.TLS,
- debug: CONFIG.LOG.LEVEL === 'debug',
- logger: bunyanLogger as any,
- ignoreTLS: CONFIG.SMTP.DISABLE_STARTTLS,
- tls,
- auth
- })
- } else { // sendmail
- logger.info('Using sendmail to send emails')
-
- this.transporter = createTransport({
- sendmail: true,
- newline: 'unix',
- path: CONFIG.SMTP.SENDMAIL
- })
- }
- } else {
+ if (!isEmailEnabled()) {
if (!isTestInstance()) {
logger.error('Cannot use SMTP server because of lack of configuration. PeerTube will not be able to send mails!')
}
- }
- }
- static isEnabled () {
- if (CONFIG.SMTP.TRANSPORT === 'sendmail') {
- return !!CONFIG.SMTP.SENDMAIL
- } else if (CONFIG.SMTP.TRANSPORT === 'smtp') {
- return !!CONFIG.SMTP.HOSTNAME && !!CONFIG.SMTP.PORT
- } else {
- return false
+ return
}
+
+ if (CONFIG.SMTP.TRANSPORT === 'smtp') this.initSMTPTransport()
+ else if (CONFIG.SMTP.TRANSPORT === 'sendmail') this.initSendmailTransport()
}
- async checkConnectionOrDie () {
+ async checkConnection () {
if (!this.transporter || CONFIG.SMTP.TRANSPORT !== 'smtp') return
logger.info('Testing SMTP server...')
try {
const success = await this.transporter.verify()
- if (success !== true) this.dieOnConnectionFailure()
+ if (success !== true) this.warnOnConnectionFailure()
logger.info('Successfully connected to SMTP server.')
} catch (err) {
- this.dieOnConnectionFailure(err)
+ this.warnOnConnectionFailure(err)
}
}
const emailPayload: EmailPayload = {
template: 'user-registered',
to,
- subject: `a new user registered on ${WEBSERVER.HOST}: ${user.username}`,
+ subject: `a new user registered on ${CONFIG.INSTANCE.NAME}: ${user.username}`,
locals: {
user
}
const videoUrl = WEBSERVER.URL + videoBlacklist.Video.getWatchStaticPath()
const reasonString = videoBlacklist.reason ? ` for the following reason: ${videoBlacklist.reason}` : ''
- const blockedString = `Your video ${videoName} (${videoUrl} on ${WEBSERVER.HOST} has been blacklisted${reasonString}.`
+ const blockedString = `Your video ${videoName} (${videoUrl} on ${CONFIG.INSTANCE.NAME} has been blacklisted${reasonString}.`
const emailPayload: EmailPayload = {
to,
const emailPayload: EmailPayload = {
to,
subject: `Video ${video.name} unblacklisted`,
- text: `Your video "${video.name}" (${videoUrl}) on ${WEBSERVER.HOST} has been unblacklisted.`,
+ text: `Your video "${video.name}" (${videoUrl}) on ${CONFIG.INSTANCE.NAME} has been unblacklisted.`,
locals: {
title: 'Your video was unblacklisted'
}
const emailPayload: EmailPayload = {
template: 'verify-email',
to: [ to ],
- subject: `Verify your email on ${WEBSERVER.HOST}`,
+ subject: `Verify your email on ${CONFIG.INSTANCE.NAME}`,
locals: {
username,
verifyEmailUrl
const emailPayload: EmailPayload = {
to: [ to ],
subject: 'Account ' + blockedWord,
- text: `Your account ${user.username} on ${WEBSERVER.HOST} has been ${blockedWord}${reasonString}.`
+ text: `Your account ${user.username} on ${CONFIG.INSTANCE.NAME} has been ${blockedWord}${reasonString}.`
}
return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
const fromDisplayName = options.from
? options.from
- : WEBSERVER.HOST
+ : CONFIG.INSTANCE.NAME
const email = new Email({
send: true,
locals: { // default variables available in all templates
WEBSERVER,
EMAIL: CONFIG.EMAIL,
+ instanceName: CONFIG.INSTANCE.NAME,
text: options.text,
subject: options.subject
}
}
}
- private dieOnConnectionFailure (err?: Error) {
+ private warnOnConnectionFailure (err?: Error) {
logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err })
- process.exit(-1)
+ }
+
+ private initSMTPTransport () {
+ logger.info('Using %s:%s as SMTP server.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT)
+
+ let tls
+ if (CONFIG.SMTP.CA_FILE) {
+ tls = {
+ ca: [ readFileSync(CONFIG.SMTP.CA_FILE) ]
+ }
+ }
+
+ let auth
+ if (CONFIG.SMTP.USERNAME && CONFIG.SMTP.PASSWORD) {
+ auth = {
+ user: CONFIG.SMTP.USERNAME,
+ pass: CONFIG.SMTP.PASSWORD
+ }
+ }
+
+ this.transporter = createTransport({
+ host: CONFIG.SMTP.HOSTNAME,
+ port: CONFIG.SMTP.PORT,
+ secure: CONFIG.SMTP.TLS,
+ debug: CONFIG.LOG.LEVEL === 'debug',
+ logger: bunyanLogger as any,
+ ignoreTLS: CONFIG.SMTP.DISABLE_STARTTLS,
+ tls,
+ auth
+ })
+ }
+
+ private initSendmailTransport () {
+ logger.info('Using sendmail to send emails')
+
+ this.transporter = createTransport({
+ sendmail: true,
+ newline: 'unix',
+ path: CONFIG.SMTP.SENDMAIL
+ })
}
static get Instance () {