From 3db9d9261dd337ce03295400abf1c4a3678e5fce Mon Sep 17 00:00:00 2001 From: Ben Adida <ben@adida.net> Date: Sun, 8 Sep 2013 13:45:40 -0700 Subject: [PATCH] updated settings to parameterize email server, and a couple other settings --- requirements.txt | 2 +- settings.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index c677677..c19cef7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django==1.4.5 -South==0.7.3 +South==0.8.2 anyjson==0.3.1 celery==3.0.16 django-celery==3.0.21 diff --git a/settings.py b/settings.py index 28f3181..8df9806 100644 --- a/settings.py +++ b/settings.py @@ -155,13 +155,13 @@ HELIOS_PRIVATE_DEFAULT = False # authentication systems enabled #AUTH_ENABLED_AUTH_SYSTEMS = ['password','facebook','twitter', 'google', 'yahoo'] -AUTH_ENABLED_AUTH_SYSTEMS = ['google'] +AUTH_ENABLED_AUTH_SYSTEMS = get_from_env('AUTH_ENABLED_AUTH_SYSTEMS', 'google').split(",") AUTH_DEFAULT_AUTH_SYSTEM = None # facebook -FACEBOOK_APP_ID = '' -FACEBOOK_API_KEY = '' -FACEBOOK_API_SECRET = '' +FACEBOOK_APP_ID = get_from_env('FACEBOOK_APP_ID','') +FACEBOOK_API_KEY = get_from_env('FACEBOOK_API_KEY','') +FACEBOOK_API_SECRET = get_from_env('FACEBOOK_API_SECRET','') # twitter TWITTER_API_KEY = '' @@ -178,7 +178,7 @@ LINKEDIN_API_SECRET = '' # email server EMAIL_HOST = get_from_env('EMAIL_HOST', 'localhost') -EMAIL_PORT = 2525 +EMAIL_PORT = int(get_from_env('EMAIL_PORT', "2525")) EMAIL_HOST_USER = get_from_env('EMAIL_HOST_USER', '') EMAIL_HOST_PASSWORD = get_from_env('EMAIL_HOST_PASSWORD', '') EMAIL_USE_TLS = False -- GitLab