From 4a8176f60c8500a4f7abb6190ce8d392846176d4 Mon Sep 17 00:00:00 2001 From: Frank Gadot Date: Wed, 13 May 2020 00:39:54 -0400 Subject: [PATCH] #4632 Email: Implement TLS/SSL --- docs/configuration/optional-settings.md | 2 ++ netbox/netbox/configuration.example.py | 2 ++ netbox/netbox/settings.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md index 3f2b29b87..46054c40a 100644 --- a/docs/configuration/optional-settings.md +++ b/docs/configuration/optional-settings.md @@ -116,6 +116,8 @@ In order to send email, NetBox needs an email server configured. The following i * PASSSWORD - Password with which to authenticate * TIMEOUT - Amount of time to wait for a connection (seconds) * FROM_EMAIL - Sender address for emails sent by NetBox +* EMAIL_USE_SSL - Server requires SSL connection (default: False) +* EMAIL_USE_TLS - Server requires TLS connection (default: False) Email is sent from NetBox only for critical events. If you would like to test the email server configuration please use the django function [send_mail()](https://docs.djangoproject.com/en/stable/topics/email/#send-mail): diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index 94497f3cd..792018e7b 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -110,6 +110,8 @@ EMAIL = { 'PASSWORD': '', 'TIMEOUT': 10, # seconds 'FROM_EMAIL': '', + 'EMAIL_USE_SSL': False, + 'EMAIL_USE_TLS': False, } # Enforcement of unique IP space can be toggled on a per-VRF basis. To enforce unique IP space within the global table diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index f928ca71e..18a64a7e7 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -252,6 +252,8 @@ EMAIL_HOST_PASSWORD = EMAIL.get('PASSWORD') EMAIL_TIMEOUT = EMAIL.get('TIMEOUT', 10) SERVER_EMAIL = EMAIL.get('FROM_EMAIL') EMAIL_SUBJECT_PREFIX = '[NetBox] ' +EMAIL_USE_SSL = EMAIL.get('SSL') +EMAIL_USE_TLS = EMAIL.get('TLS') #