Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

cof/settings_dev.py

@@ -29,7 +29,7 @@ SECRET_KEY = 'q()(zn4m63i%5cp4)f+ww4-28_w+ly3q9=6imw2ciu&_(5_4ah'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['127.0.0.1']
 
 
 # Application definition
@@ -123,6 +123,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
 STATIC_URL = '/static/'
+STATIC_ROOT = '/var/www/static/'
 
 STATICFILES_DIRS = (
   os.path.join(BASE_DIR, 'static/'),
@@ -154,12 +155,12 @@ RAPPEL_REPLY_TO = RAPPEL_FROM
 REVENTE_FROM = 'BDA-Revente <bda-revente@ens.fr>'
 REVENTE_REPLY_TO = REVENTE_FROM
 
-LOGIN_URL = "/login"
-LOGIN_REDIRECT_URL = "/"
+LOGIN_URL = "/gestion/login"
+LOGIN_REDIRECT_URL = "/gestion/"
 
 CAS_SERVER_URL = 'https://cas.eleves.ens.fr/'
 CAS_IGNORE_REFERER = True
-CAS_REDIRECT_URL = '/'
+CAS_REDIRECT_URL = '/gestion/'
 CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
@@ -178,7 +179,7 @@ CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "asgi_redis.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [("redis://:redis_password@127.0.0.1:6379/0")],
+            "hosts": [("localhost", 6379)],
         },
         "ROUTING": "cof.routing.channel_routing",
     }