X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fplanetstack%2Fsettings.py;h=f7f151ba89dc09834850559a0a072a765dc61e3e;hb=c2d7c700233884cf21df441192598df8347994ea;hp=811c413bbeca68daa7e289ad4636e9ab5176d483;hpb=75f4be294dd4d7dd7d3159f75e9d7c9be437b160;p=plstackapi.git

diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index 811c413..f7f151b 100644
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -111,6 +111,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'core.middleware.GlobalRequestMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -149,7 +150,9 @@ INSTALLED_APPS = (
     'cassandra',
     'kairos',
     'nagios',
-    'syndicate',
+#    'urlfilter',
+    'servcomp',
+    'syndicate_storage',
     'geoposition',
 )
 
@@ -212,10 +215,12 @@ SUIT_CONFIG = {
         {'label': 'Users', 'icon':'icon-user', 'url': '/admin/core/user/'},
         {'label': 'RequestRouter', 'icon':'icon-cog', 'app': 'requestrouter'},
         {'label': 'HyperCache', 'icon':'icon-cog', 'app': 'hpc'},
-        {'label': 'Syndicate', 'icon':'icon-cog', 'app': 'syndicate'},
-        {'label': 'Cassandra', 'icon':'icon-cog', 'app': 'cassandra'},
+        {'label': 'Syndicate', 'icon':'icon-cog', 'app': 'syndicate_storage'},
+#        {'label': 'Cassandra', 'icon':'icon-cog', 'app': 'cassandra'},
 #        {'label': 'KairosDB', 'icon':'icon-cog', 'app': 'kairos'},
 #        {'label': 'Nagios', 'icon':'icon-cog', 'app': 'nagios'},
+#       {'label': 'URL Filter', 'icon': 'icon-cog', 'app': 'urlfilter'},
+       {'label': 'Service Comp', 'icon': 'icon-cog', 'app': 'servcomp'},
 
         #{'label': 'Configured Services', 'icon':'icon-cog', 'models': [{'label': 'Content Delivery Network', 'app':'hpc'}]},
     #     'sites',
@@ -261,3 +266,10 @@ LOGGING = {
 BIGQUERY_TABLE = getattr(config, "bigquery_table", "demoevents")
 
 DISABLE_MINIDASHBOARD = getattr(config, "gui_disable_minidashboard", False)
+ENCRYPTED_FIELDS_KEYDIR = '/opt/planetstack/private_keys'
+ENCRYPTED_FIELD_MODE = 'ENCRYPT'
+
+STATISTICS_DRIVER = getattr(config, "statistics_driver", "ceilometer")
+
+# prevents warnings on django 1.7                                                                                                 
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'