fix regex for project name

[osm/LW-UI.git] / sf_t3d / settings.py

diff --git a/sf_t3d/settings.py b/sf_t3d/settings.py
index cfd7a3e..753537a 100644 (file)
--- a/sf_t3d/settings.py
+++ b/sf_t3d/settings.py
@@ -21,13 +21,14 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'o5+o2jv(3-dqr(&ia#-@79cgr%xi*s+6xjws^8cxp211ge#buf'
+if os.getenv('DJANGO_ENV') == 'prod':
+    DEBUG = False
+else:
+    DEBUG = True
+    print DEBUG
+ALLOWED_HOSTS = ['*']
 
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
-AUTH_USER_MODEL = "sf_user.CustomUser"
+AUTH_USER_MODEL = "authosm.OsmUser"
 
 SITE_NAME = "Open Source MANO"
 SHORT_SITE_NAME = "OSM"
@@ -45,15 +46,20 @@ INSTALLED_APPS = [
     'django.contrib.contenttypes',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'sf_user',
+    'django.contrib.sessions',
+    'authosm',
     'projecthandler',
     'vimhandler',
-    'instancehandler'
+    'instancehandler',
+    'sdnctrlhandler',
+    'userhandler'
+
 ]
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'projecthandler.middleware.OsmProjectMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -61,9 +67,10 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
+
 ]
 
-SESSION_ENGINE='sf_user.sessions'
+SESSION_ENGINE ='django.contrib.sessions.backends.db'
 SESSION_COOKIE_AGE = 3500 #25 min
 SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 SESSION_SAVE_EVERY_REQUEST = True
@@ -80,6 +87,8 @@ TEMPLATES = [
             os.path.join(BASE_DIR, 'projecthandler', 'template', 'project'),
             os.path.join(BASE_DIR, 'vimhandler', 'template'),
             os.path.join(BASE_DIR, 'instancehandler', 'template'),
+            os.path.join(BASE_DIR, 'sdnctrlhandler', 'template'),
+            os.path.join(BASE_DIR, 'userhandler', 'templates'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -92,7 +101,7 @@ TEMPLATES = [
             ],
             'libraries':{
                 'get': 'sf_t3d.templatetags.get',
-
+                'date_tag': 'sf_t3d.templatetags.datetag',
             }
         },
     },
@@ -111,6 +120,8 @@ DATABASES = {
     }
 }
 
+AUTHENTICATION_BACKENDS = ['authosm.backend.OsmBackend']
+
 
 # Password validation
 # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
@@ -149,20 +160,21 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_URL = '/static/'
-
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'django.contrib.staticfiles.finders.DefaultStorageFinder'
-)
-
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    os.path.join(BASE_DIR, "static"),
-)
+if DEBUG:
+    STATICFILES_FINDERS = (
+        'django.contrib.staticfiles.finders.FileSystemFinder',
+        'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+        'django.contrib.staticfiles.finders.DefaultStorageFinder'
+    )
+    STATICFILES_DIRS = (
+        # Put strings here, like "/home/html/static" or "C:/www/django/static".
+        # Always use forward slashes, even on Windows.
+        # Don't forget to use absolute paths, not relative paths.
+        os.path.join(BASE_DIR, "static"),
+    )
+else:
+    STATIC_ROOT = os.path.join(BASE_DIR, "static/")
 
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),
-)
\ No newline at end of file
+)