correction env.merge et realm keycloak

env/.env

@@ -34,6 +34,12 @@ NINEAPACHE_SERVICE_NAME=nineapache
 NINEAPACHE_ACTIVATE=1
 NINEAPACHE_LOCAL=1
 
+# FAKESMTP
+# fake-smtp server
+FAKESMTP_SERVICE_NAME=fakesmtp
+FAKESMTP_LOCAL=1
+FAKESMTP_ACTIVATE=1
+
 # MTA
 # passerelle courriel
 MTA_SERVICE_NAME=mta
@@ -42,19 +48,9 @@ MTA_LOCAL=1
 MTA_RELAY_HOST=
 MTA_RELAY_PORT=
 MTA_RELAY_USER="user"
+MTA_RELAY_HOST="$FAKESMTP_SERVICE_NAME"
+MTA_RELAY_PORT=2525
 
-# DEBUGING MTA
-# fake-smtp server
-FAKESMTP_SERVICE_NAME=fakesmtp
-FAKESMTP_LOCAL=1
-FAKESMTP_ACTIVATE=1
-# si actif, il faut sans doute l’utiliser
-# comme passerelle pour le service MTA
-if [ "$FAKESMTP_ACTIVATE" -eq 1 ]
-then
-    MTA_RELAY_HOST="$FAKESMTP_NAME"
-    MTA_RELAY_PORT=2525
-fi
 
 # MARIADB
 MARIADB_SERVICE_NAME=mariadb