From 4feb567af7151f0158e7828a32c6980840822650 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Tue, 28 Jun 2022 22:31:56 +0200
Subject: [PATCH] Update django-redis-cache and fix vagrant setup

---
 provisioning/nginx/gestiocof.conf   | 4 ++--
 provisioning/systemd/daphne.service | 2 +-
 provisioning/systemd/worker.service | 5 ++++-
 requirements-prod.txt               | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/provisioning/nginx/gestiocof.conf b/provisioning/nginx/gestiocof.conf
index f623bcf9..7d7567c6 100644
--- a/provisioning/nginx/gestiocof.conf
+++ b/provisioning/nginx/gestiocof.conf
@@ -15,8 +15,8 @@ server {
   rewrite ^/gestion$ http://localhost:8080/gestion/ redirect;
 
   # Les pages statiques sont servies à part.
-  location /gestion/static { try_files $uri $uri/ =404; }
-  location /gestion/media  { try_files $uri $uri/ =404; }
+  location /static { try_files $uri $uri/ =404; }
+  location /media  { try_files $uri $uri/ =404; }
 
   # On proxy-pass les requêtes vers les pages dynamiques à daphne
   location / {
diff --git a/provisioning/systemd/daphne.service b/provisioning/systemd/daphne.service
index 517c86c9..bae9f3ca 100644
--- a/provisioning/systemd/daphne.service
+++ b/provisioning/systemd/daphne.service
@@ -11,7 +11,7 @@ WorkingDirectory=/vagrant
 Environment="DJANGO_SETTINGS_MODULE=gestioasso.settings.dev"
 ExecStart=/home/vagrant/venv/bin/daphne \
             -u /srv/gestiocof/gestiocof.sock \
-            gestioasso.asgi:channel_layer
+            gestioasso.asgi:application
 
 [Install]
 WantedBy=multi-user.target
diff --git a/provisioning/systemd/worker.service b/provisioning/systemd/worker.service
index a9ea733f..0d97e9a4 100644
--- a/provisioning/systemd/worker.service
+++ b/provisioning/systemd/worker.service
@@ -10,7 +10,10 @@ Group=vagrant
 TimeoutSec=300
 WorkingDirectory=/vagrant
 Environment="DJANGO_SETTINGS_MODULE=gestioasso.settings.dev"
-ExecStart=/home/vagrant/venv/bin/python manage.py runworker
+ExecStart=/home/vagrant/venv/bin/python manage.py runworker \
+          'kfet.open.team' \
+          'kfet.open.base' \
+          'kpsul'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/requirements-prod.txt b/requirements-prod.txt
index bd50ba77..2f6c556b 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -4,7 +4,7 @@
 psycopg2<2.8
 
 # Redis
-django-redis-cache==2.1.*
+django-redis-cache==3.0.*
 redis~=2.10.6
 channels-redis==2.4.*