Merge branch 'feature-settings-fixes' into 'master'

Feature Settings Fixes

fixes #235

circle/circle/settings/base.py

@@ -161,7 +161,7 @@ STATICFILES_FINDERS = (
 )
 )
 ########## END STATIC FILE CONFIGURATION
 ########## END STATIC FILE CONFIGURATION
 
 
-p = join(dirname(SITE_ROOT), 'site-circle/static')
+p = normpath(join(SITE_ROOT, '../../site-circle/static'))
 if exists(p):
 if exists(p):
     STATICFILES_DIRS = (p, )
     STATICFILES_DIRS = (p, )
 
 
@@ -211,8 +211,8 @@ TEMPLATE_LOADERS = (
 
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
 TEMPLATE_DIRS = (
 TEMPLATE_DIRS = (
+    normpath(join(SITE_ROOT, '../../site-circle/templates')),
     normpath(join(SITE_ROOT, 'templates')),
     normpath(join(SITE_ROOT, 'templates')),
-    join(dirname(SITE_ROOT), 'site-circle/templates'),
 )
 )
 ########## END TEMPLATE CONFIGURATION
 ########## END TEMPLATE CONFIGURATION
 
 

circle/circle/settings/production.py

@@ -24,18 +24,10 @@ from os import environ
 from base import *  # noqa
 from base import *  # noqa
 
 
 
 
-def get_env_setting(setting):
-    """ Get the environment setting or return exception """
-    try:
-        return environ[setting]
-    except KeyError:
-        error_msg = "Set the %s env variable" % setting
-        raise ImproperlyConfigured(error_msg)
-
 ########## HOST CONFIGURATION
 ########## HOST CONFIGURATION
 # See: https://docs.djangoproject.com/en/1.5/releases/1.5/
 # See: https://docs.djangoproject.com/en/1.5/releases/1.5/
 #      #allowed-hosts-required-in-production
 #      #allowed-hosts-required-in-production
-ALLOWED_HOSTS = get_env_setting('DJANGO_ALLOWED_HOSTS').split(',')
+ALLOWED_HOSTS = get_env_variable('DJANGO_ALLOWED_HOSTS').split(',')
 ########## END HOST CONFIGURATION
 ########## END HOST CONFIGURATION
 
 
 ########## EMAIL CONFIGURATION
 ########## EMAIL CONFIGURATION
@@ -44,18 +36,18 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 
 
 try:
 try:
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-    EMAIL_HOST = environ.get('EMAIL_HOST')
+    EMAIL_HOST = get_env_variable('EMAIL_HOST')
 except ImproperlyConfigured:
 except ImproperlyConfigured:
-    pass
+    EMAIL_HOST = 'localhost'
 else:
 else:
     # https://docs.djangoproject.com/en/dev/ref/settings/#email-host-password
     # https://docs.djangoproject.com/en/dev/ref/settings/#email-host-password
-    EMAIL_HOST_PASSWORD = environ.get('EMAIL_HOST_PASSWORD', '')
+    EMAIL_HOST_PASSWORD = get_env_variable('EMAIL_HOST_PASSWORD', '')
 
 
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host-user
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host-user
-    EMAIL_HOST_USER = environ.get('EMAIL_HOST_USER', 'your_email@example.com')
+    EMAIL_HOST_USER = get_env_variable('EMAIL_HOST_USER', 'your_email@example.com')
 
 
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-port
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-port
-    EMAIL_PORT = environ.get('EMAIL_PORT', 587)
+    EMAIL_PORT = get_env_variable('EMAIL_PORT', 587)
 
 
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-use-tls
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-use-tls
     EMAIL_USE_TLS = True
     EMAIL_USE_TLS = True
@@ -64,7 +56,8 @@ else:
 EMAIL_SUBJECT_PREFIX = '[%s] ' % SITE_NAME
 EMAIL_SUBJECT_PREFIX = '[%s] ' % SITE_NAME
 
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#server-email
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#server-email
-SERVER_EMAIL = EMAIL_HOST_USER
+DEFAULT_FROM_EMAIL = get_env_variable('DEFAULT_FROM_EMAIL')
+SERVER_EMAIL = get_env_variable('SERVER_EMAIL', DEFAULT_FROM_EMAIL)
 ########## END EMAIL CONFIGURATION
 ########## END EMAIL CONFIGURATION
 
 
 
 
@@ -83,5 +76,12 @@ CACHES = {
 
 
 ########## SECRET CONFIGURATION
 ########## SECRET CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
-SECRET_KEY = get_env_setting('SECRET_KEY')
+SECRET_KEY = get_env_variable('SECRET_KEY')
 ########## END SECRET CONFIGURATION
 ########## END SECRET CONFIGURATION
+
+level = environ.get('LOGLEVEL', 'INFO')
+LOGGING['handlers']['syslog']['level'] = level
+for i in LOCAL_APPS:
+    LOGGING['loggers'][i] = {'handlers': ['syslog'], 'level': level}
+LOGGING['loggers']['djangosaml2'] = {'handlers': ['syslog'], 'level': level}
+LOGGING['loggers']['django'] = {'handlers': ['syslog'], 'level': level}