Parcourir la source

Use MAIL_FROM and MAIL_SMTP_PASSWORD

Girish Ramakrishnan il y a 9 ans
Parent
commit
e367d4ea9b
2 fichiers modifiés avec 5 ajouts et 3 suppressions
  1. 3 3
      local.py
  2. 2 0
      start.sh

+ 3 - 3
local.py

@@ -14,7 +14,7 @@ DEBUG = False
 TEMPLATE_DEBUG = False
 PUBLIC_REGISTER_ENABLED = True
 
-DEFAULT_FROM_EMAIL = "##MAIL_SMTP_USERNAME##@##MAIL_DOMAIN##"
+DEFAULT_FROM_EMAIL = "##MAIL_FROM##"
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
 
 # Uncomment and populate with proper connection parameters
@@ -24,7 +24,7 @@ EMAIL_USE_TLS = False
 EMAIL_HOST = "##MAIL_SMTP_SERVER##"
 EMAIL_PORT = ##MAIL_SMTP_PORT##
 EMAIL_HOST_USER = "##MAIL_SMTP_USERNAME##"
-# EMAIL_HOST_PASSWORD = ""
+EMAIL_HOST_PASSWORD = "##MAIL_SMTP_PASSWORD##"
 
 # Database config
 DATABASES = {
@@ -55,4 +55,4 @@ LDAP_SEARCH_SUFFIX = None # '@example.com'
 
 # Names of LDAP properties on user account to get email and full name
 LDAP_EMAIL_PROPERTY = "mail"
-LDAP_FULL_NAME_PROPERTY = "displayname"
+LDAP_FULL_NAME_PROPERTY = "displayname"

+ 2 - 0
start.sh

@@ -7,9 +7,11 @@ echo "========= Start ========="
 echo "--> local.py"
 sed -e "s/##APP_DOMAIN##/${APP_DOMAIN}/" \
     -e "s/##MAIL_DOMAIN##/${MAIL_DOMAIN}/" \
+    -e "s/##MAIL_FROM##/${MAIL_FROM}/" \
     -e "s/##MAIL_SMTP_SERVER##/${MAIL_SMTP_SERVER}/" \
     -e "s/##MAIL_SMTP_PORT##/${MAIL_SMTP_PORT}/" \
     -e "s/##MAIL_SMTP_USERNAME##/${MAIL_SMTP_USERNAME}/" \
+    -e "s/##MAIL_SMTP_PASSWORD##/${MAIL_SMTP_PASSWORD}/" \
     -e "s/##LDAP_SERVER##/${LDAP_SERVER}/" \
     -e "s/##LDAP_PORT##/${LDAP_PORT}/" \
     -e "s/##LDAP_USERS_BASE_DN##/${LDAP_USERS_BASE_DN}/" \