Skip to content
Snippets Groups Projects
Commit 3db9d926 authored by Ben Adida's avatar Ben Adida
Browse files

updated settings to parameterize email server, and a couple other settings

parent d375bd43
No related branches found
No related tags found
No related merge requests found
Django==1.4.5 Django==1.4.5
South==0.7.3 South==0.8.2
anyjson==0.3.1 anyjson==0.3.1
celery==3.0.16 celery==3.0.16
django-celery==3.0.21 django-celery==3.0.21
......
...@@ -155,13 +155,13 @@ HELIOS_PRIVATE_DEFAULT = False ...@@ -155,13 +155,13 @@ HELIOS_PRIVATE_DEFAULT = False
# authentication systems enabled # authentication systems enabled
#AUTH_ENABLED_AUTH_SYSTEMS = ['password','facebook','twitter', 'google', 'yahoo'] #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 AUTH_DEFAULT_AUTH_SYSTEM = None
# facebook # facebook
FACEBOOK_APP_ID = '' FACEBOOK_APP_ID = get_from_env('FACEBOOK_APP_ID','')
FACEBOOK_API_KEY = '' FACEBOOK_API_KEY = get_from_env('FACEBOOK_API_KEY','')
FACEBOOK_API_SECRET = '' FACEBOOK_API_SECRET = get_from_env('FACEBOOK_API_SECRET','')
# twitter # twitter
TWITTER_API_KEY = '' TWITTER_API_KEY = ''
...@@ -178,7 +178,7 @@ LINKEDIN_API_SECRET = '' ...@@ -178,7 +178,7 @@ LINKEDIN_API_SECRET = ''
# email server # email server
EMAIL_HOST = get_from_env('EMAIL_HOST', 'localhost') 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_USER = get_from_env('EMAIL_HOST_USER', '')
EMAIL_HOST_PASSWORD = get_from_env('EMAIL_HOST_PASSWORD', '') EMAIL_HOST_PASSWORD = get_from_env('EMAIL_HOST_PASSWORD', '')
EMAIL_USE_TLS = False EMAIL_USE_TLS = False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment