From a4fc5acec45bbec34f342de231ad7578ffbee4e3 Mon Sep 17 00:00:00 2001
From: Kirosbr <brocasm@resk-u.ch>
Date: Tue, 16 Jul 2024 03:08:04 +0200
Subject: [PATCH] =?UTF-8?q?changement=20d'emplacement=20des=20fichiers=20c?=
 =?UTF-8?q?onfig=20sp=C3=A9cifiques=20=C3=A0=20l'environnement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 2 +-
 Reskreen/settings.py                          | 2 +-
 {Reskreen => config}/my.cnf                   | 0
 {Reskreen => config}/my_dev.cnf               | 0
 {Reskreen => config}/server_config_default.py | 0
 docker-compose.yml                            | 9 +++++++--
 6 files changed, 9 insertions(+), 4 deletions(-)
 rename {Reskreen => config}/my.cnf (100%)
 rename {Reskreen => config}/my_dev.cnf (100%)
 rename {Reskreen => config}/server_config_default.py (100%)

diff --git a/.gitignore b/.gitignore
index 7b4e1cc..53f6df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -368,7 +368,7 @@ venv
 *migrations/
 
 
-Reskreen/server_config.py
+server_config.py
 ./db.sqlite3
 db.sqlite3
 media/
diff --git a/Reskreen/settings.py b/Reskreen/settings.py
index 2ba3a3c..484242e 100644
--- a/Reskreen/settings.py
+++ b/Reskreen/settings.py
@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/4.0/ref/settings/
 
 from pathlib import Path
 import os
-from Reskreen.server_config import *
+from config.server_config import *
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
diff --git a/Reskreen/my.cnf b/config/my.cnf
similarity index 100%
rename from Reskreen/my.cnf
rename to config/my.cnf
diff --git a/Reskreen/my_dev.cnf b/config/my_dev.cnf
similarity index 100%
rename from Reskreen/my_dev.cnf
rename to config/my_dev.cnf
diff --git a/Reskreen/server_config_default.py b/config/server_config_default.py
similarity index 100%
rename from Reskreen/server_config_default.py
rename to config/server_config_default.py
diff --git a/docker-compose.yml b/docker-compose.yml
index 29fc8fe..82c8f9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,13 +11,18 @@ services:
     ports:
       - "8081:8080"
     volumes:
-      - reskreen-data:/app
+      - reskreen-data:/app/config
 
   backend-cron:
     image: registry.prod.resk-u.ch/reskreen:latest
     command: crond -f
     volumes:
-      - reskreen-data:/app
+      - reskreen-data:/app/config
 
 volumes:
   reskreen-data:
+    driver: local
+    driver_opts:
+      type: none
+      device: /home/prod/Reskreen
+      o: bind