Merge branch 'master' of git.blender.org:pillar into elastic

pillar/config.py

@@ -28,7 +28,7 @@ SECRET_KEY = ''
 AUTH_TOKEN_HMAC_KEY = b''
 
 # Authentication settings
-BLENDER_ID_ENDPOINT = 'http://blender_id:8000/'
+BLENDER_ID_ENDPOINT = 'http://blender-id:8000/'
 
 PILLAR_SERVER_ENDPOINT = 'http://pillar:5001/api/'
 
@@ -124,7 +124,7 @@ BLENDER_ID_USER_INFO_TOKEN = '-set-in-config-local-'
 #    'blender-id': {
 #        'id': 'CLOUD-OF-SNOWFLAKES-43',
 #        'secret': 'thesecret',
-#        'base_url': 'http://blender_id:8000/'
+#        'base_url': 'http://blender-id:8000/'
 #     }
 # }
 # OAuth providers are defined in pillar.auth.oauth
@@ -238,3 +238,13 @@ DEFAULT_LOCALE = 'en_US'
 # never show the site in English.
 SUPPORT_ENGLISH = True
 
+
+# Mail options, see pillar.celery.email_tasks.
+SMTP_HOST = 'localhost'
+SMTP_PORT = 2525
+SMTP_USERNAME = ''
+SMTP_PASSWORD = ''
+SMTP_TIMEOUT = 30  # timeout in seconds, https://docs.python.org/3/library/smtplib.html#smtplib.SMTP
+MAIL_RETRY = 180  # in seconds, delay until trying to send an email again.
+MAIL_DEFAULT_FROM_NAME = 'Blender Cloud'
+MAIL_DEFAULT_FROM_ADDR = 'cloudsupport@localhost'