From abb1adecb7e8fbf8d7a31d4fed2d4475c35d7b7c Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 12 Dec 2023 08:47:41 +0100
Subject: [PATCH] Maj env et doc

---
 .env                           |  2 +-
 config/packages/cache.yaml     |  2 +-
 config/packages/framework.yaml |  4 ++--
 readme.md                      | 11 +++++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 97e916a..c4046f5 100644
--- a/.env
+++ b/.env
@@ -40,4 +40,4 @@ LOCK_DSN=flock
 ###> sentry/sentry-symfony ###
 SENTRY_DSN=
 ###< sentry/sentry-symfony ###
-REDIS_URL=redis://redis:6379
\ No newline at end of file
+REDIS_DSN=redis://redis:6379
diff --git a/config/packages/cache.yaml b/config/packages/cache.yaml
index 9f7d58f..1d62028 100644
--- a/config/packages/cache.yaml
+++ b/config/packages/cache.yaml
@@ -9,7 +9,7 @@ framework:
 
         # Redis
         app: cache.adapter.redis
-        default_redis_provider: '%env(REDIS_URL)%'
+        default_redis_provider: '%env(REDIS_DSN)%'
 
         # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
         #app: cache.adapter.apcu
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
index 2a73793..68da994 100644
--- a/config/packages/framework.yaml
+++ b/config/packages/framework.yaml
@@ -12,7 +12,7 @@ framework:
     # Enables session support. Note that the session will ONLY be started if you read or write from it.
     # Remove or comment this section to explicitly disable session support.
     session:
-        handler_id: '%env(REDIS_URL)%'
+        handler_id: '%env(REDIS_DSN)%'
         cookie_secure: auto
         cookie_samesite: lax
         storage_factory_id: session.storage.factory.native
@@ -31,4 +31,4 @@ when@test:
     framework:
         test: true
         session:
-            storage_factory_id: session.storage.factory.mock_file
\ No newline at end of file
+            storage_factory_id: session.storage.factory.mock_file
diff --git a/readme.md b/readme.md
index f2837bc..8e7ff15 100644
--- a/readme.md
+++ b/readme.md
@@ -36,6 +36,7 @@ DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
 APP_LOCALES="fr,en"
 HASH_ALGO_LEGACY="sha256, bcrypt"
 SECURITY_PATTERN="password,salt,pepper"
+REDIS_DSN="redis://redis:6379
 PEPPER=
 ```
 ## Tests password
@@ -59,6 +60,12 @@ et conserver le pepper dans service.yaml
 env(PEPPER): "257d62c24cd352c21b51c26dba678c8ff05011a89022aec106185bf67c69aa8b"
 
 ```
+
+### Redis
+
+La variable `REDIS_DSN` est obligatoire. Hydra-sql utilise dorénavant Redis pour le stockage du cache et des session. Compatible Redis Sentinel
+ex : `'redis:?host[redis1:26379]&host[redis2:26379]&host[redis3:26379]&redis_sentinel=mymaster'`
+
 ### mariadb
 ```
 En plus de tester la connexion à une différente base de donnée, on teste le hashage de password sans salt ni pepper
@@ -107,7 +114,7 @@ Permet d'adapter les requetes SQL à la base de donnée utilisée en indiquant l
 
 pdo_configuration/pdo.yaml
 ```
-sql_login: 
+sql_login:
   login_column_name: email
   password_column_name: password
   salt_column_name: ~
@@ -127,4 +134,4 @@ sql_login:
 |`hydra-sql`|Login/Consent/Logout App (ce projet)|`8082`|
 |`postgres`| Base de donnée postgres support du test et pour hydra|`5432`
 |`mariadb`| Base de donnée mariadb support du test|`3306`
-|`pgadmin`| pour administrer la base de donnée |`8085`
\ No newline at end of file
+|`pgadmin`| pour administrer la base de donnée |`8085`