Djangocon coding

[tranquillity.git] / tranquillity / settings.py

diff --git a/tranquillity/settings.py b/tranquillity/settings.py
index 74d30b0e42d6933159f42cbd5bb2363829863ba5..fc78baba8a8fdd219ac69d347d166aaaddf6bfd4 100644 (file)
--- a/tranquillity/settings.py
+++ b/tranquillity/settings.py
@@ -11,7 +11,10 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
 """
 
 import os
 """
 
 import os

-from settings_secret import *
+try:
+    from .settings_secret import *
+except ImportError:
+    pass

 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))


@@ -125,3 +128,4 @@ STATIC_URL = '/static/'
 # Redirect to home URL after login (Default redirects to /accounts/profile/)
 LOGIN_REDIRECT_URL = '/'
 AUTHENTICATION_BACKENDS = ['tranquillity.auth_backend.EmailBackend']
 # Redirect to home URL after login (Default redirects to /accounts/profile/)
 LOGIN_REDIRECT_URL = '/'
 AUTHENTICATION_BACKENDS = ['tranquillity.auth_backend.EmailBackend']

+AUTH_USER_MODEL = 'customerportal.User'