Merge branch 'master' into aureplop/kfet_cms

cof/settings/common.py

@@ -19,11 +19,12 @@ except ImportError:
 except KeyError:
     raise RuntimeError("Secrets missing")
 
+
 # Other secrets
 try:
     from .secret import (
         SECRET_KEY, RECAPTCHA_PUBLIC_KEY, RECAPTCHA_PRIVATE_KEY, ADMINS,
-        REDIS_PASSWD, REDIS_DB, REDIS_HOST, REDIS_PORT
+        REDIS_PASSWD, REDIS_DB, REDIS_HOST, REDIS_PORT, KFETOPEN_TOKEN,
     )
 except ImportError:
     raise RuntimeError("Secrets missing")
@@ -52,6 +53,7 @@ INSTALLED_APPS = [
     'django_cas_ng',
     'bootstrapform',
     'kfet',
+    'kfet.open',
     'channels',
     'widget_tweaks',
     'custommail',
@@ -176,6 +178,18 @@ AUTHENTICATION_BACKENDS = (
 
 RECAPTCHA_USE_SSL = True
 
+# Cache settings
+
+CACHES = {
+    'default': {
+        'BACKEND': 'redis_cache.RedisCache',
+        'LOCATION': 'redis://:{passwd}@{host}:{port}/db'
+                    .format(passwd=REDIS_PASSWD, host=REDIS_HOST,
+                            port=REDIS_PORT, db=REDIS_DB),
+    }
+}
+
+
 # Channels settings
 
 CHANNEL_LAYERS = {
@@ -188,7 +202,7 @@ CHANNEL_LAYERS = {
                         port=REDIS_PORT, db=REDIS_DB)
             )],
         },
-        "ROUTING": "cof.routing.channel_routing",
+        "ROUTING": "cof.routing.routing",
     }
 }