Merge branch 'master' into aureplop/kfet_open

This commit is contained in:
Aurélien Delobelle 2017-06-21 05:47:53 +02:00
commit 2381af92e3
10 changed files with 145 additions and 67 deletions

View file

@ -19,6 +19,7 @@ except ImportError:
except KeyError:
raise RuntimeError("Secrets missing")
# Other secrets
try:
from .secret import (
@ -155,6 +156,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 = {