Django upgrade defined ALLOWED_HOSTS in settings

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index 5fe2169..d18ca92 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -1,5 +1,7 @@
 import os.path
 import logging
+import subprocess
+
 
 logger = logging.getLogger('myslice')
 
@@ -17,8 +19,6 @@ config = ConfigEngine()
 
 import myslice.components as components
 
-
-
 # import djcelery
 # djcelery.setup_loader()
 
@@ -29,7 +29,12 @@ try:
 except:
     building=True
 
-
+if not config.myslice.portal_version:
+    try:
+        v = subprocess.check_output(["git", "--git-dir", ROOT + "/.git", "describe"])
+        PORTAL_VERSION = '-'.join(v.split('-')[:-1])
+    except:
+        PORTAL_VERSION = 'not using git' 
 
 # DEBUG
 if config.myslice.debug :
@@ -44,6 +49,16 @@ if config.myslice.theme :
 else :
     theme = None
 
+if config.myslice.theme_label :
+    theme_label = config.myslice.theme_label
+else :
+    theme_label = theme
+
+if config.myslice.theme_logo :
+    theme_logo = config.myslice.theme_logo
+else :
+    theme_logo = theme + '.png'
+
 # HTTPROOT
 if config.myslice.httproot :
     HTTPROOT = config.myslice.httproot
@@ -76,6 +91,9 @@ MANAGERS = ADMINS
 #DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
 #EMAIL_HOST_PASSWORD = "mypassword"
 
+if config.myslice.default_sender:
+    DEFAULT_FROM_EMAIL = config.myslice.default_sender
+
 EMAIL_HOST = "localhost"
 EMAIL_PORT = 25
 EMAIL_USE_TLS = False
@@ -157,10 +175,6 @@ MEDIA_URL = ''
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = os.path.join(HTTPROOT,'static')
 
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
 # Additional locations of static files
 STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
@@ -186,18 +200,14 @@ STATICFILES_FINDERS = (
 ###    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
-#TEMPLATE_CONTEXT_PROCESSORS = (
-#    'django.contrib.auth.context_processors.auth',
-#    'django.core.context_processors.debug',
-#    'django.core.context_processors.i18n',
-#    'django.core.context_processors.media',
-#    'django.core.context_processors.static',
-#    'django.core.context_processors.request',
-#    'django.contrib.messages.context_processors.messages',
-#)
+if config.myslice.secret_key:
+    # Make this unique, and don't share it with anybody.
+    SECRET_KEY = config.myslice.secret_key
+else:
+    raise Exception, "SECRET_KEY Not defined: Please setup a secret_key value in myslice.ini"
 
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 't%n(3h)&r^n8(+8)(sp29t^$c2#t(m3)e2!02l8w1#36tl#t27'
+AUTHENTICATION_BACKENDS = ('localauth.manifoldbackend.ManifoldBackend',
+                           'django.contrib.auth.backends.ModelBackend')
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -344,9 +354,6 @@ LOGGING = {
     }
 }
 
-AUTHENTICATION_BACKENDS = ('localauth.manifoldbackend.ManifoldBackend',
-                           'django.contrib.auth.backends.ModelBackend')
-
 ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
 # without this setting django will return a 403 forbidden error, which is fine
 # if you need to see the error message then use this setting
@@ -359,6 +366,14 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 
 ####SLA#####
 
-SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+SLA_COLLECTOR_URL = "https://157.193.215.125:4001/sla-collector/sla"
 SLA_COLLECTOR_USER = "portal"
 SLA_COLLECTOR_PASSWORD = "password"
+
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# test
+ALLOWED_HOSTS = '*onelab.eu'