From abb4361546e3885d90dea54a7f6ebd3d503f4f81 Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Sun, 8 Dec 2024 18:15:36 +0100
Subject: [PATCH] update

---
 .docker-compose.http.yml |  8 ++++++--
 .gitignore               |  1 +
 setup.sh                 | 14 +++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.docker-compose.http.yml b/.docker-compose.http.yml
index e049870..80a2a94 100644
--- a/.docker-compose.http.yml
+++ b/.docker-compose.http.yml
@@ -25,7 +25,9 @@ services:
     extra_hosts:
       - "<clientUrl>:<hostIp>"
     env_file:
+      - ./.env
       - ./.env.local
+      - ./.env.custom
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.websocket-ja.rule=Host(`<clientUrl>`) && PathPrefix(`/ws`)"
@@ -42,7 +44,9 @@ services:
       db-ja:
         condition: service_healthy
     env_file:
+      - ./.env
       - ./.env.local
+      - ./.env.custom
     extra_hosts:
       - "<clientUrl>:<hostIp>"
     labels:
@@ -50,7 +54,6 @@ services:
       - "traefik.http.routers.app-ja.rule=Host(`<clientUrl>`)"
       - "traefik.http.routers.app-ja.entrypoints=web"
     volumes:
-      - ja_data:/var/www/html/data
       - theme_data:/var/www/html/theme
       - image_upload:/var/www/html/public/uploads/images
       - theme_assests_data:/var/www/html/public/theme
@@ -82,7 +85,9 @@ services:
       db-ja:
         condition: service_healthy
     env_file:
+      - ./.env
       - ./.env.local
+      - ./.env.custom
     restart: unless-stopped
     command:
       - start-dev
@@ -104,7 +109,6 @@ networks:
 
 volumes:
   mariadb:
-  ja_data:
   image_upload:
   theme_data:
   theme_assests_data:
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d5fb17d..c67a48f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Ignore Local Docker Config
 docker.conf
 .env.local
+.env.custom
 
 # Ignore Custom Keycloak Realm
 keycloak/realm-export.json
diff --git a/setup.sh b/setup.sh
index 5bc776d..ba2df4e 100644
--- a/setup.sh
+++ b/setup.sh
@@ -33,14 +33,14 @@ else
     touch $FILE
     KEYCLOAK_PW=$(date +%s | sha256sum | base64 | head -c 32)
     JITSI_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32)
-    WEBSOCKET_SECRET=$(date +%s | sha256sum | base64 | head -c 32)
+    MERCURE_JWT_SECRET=$(date +%s | sha256sum | base64 | head -c 32)
     KEYCLOAK_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32)
-    KEYCLOAK_CLIENT_SECRET=$(date +%s | sha256sum | base64 | head -c 32)
+    NEW_UUID=$(date +%s | sha256sum | base64 | head -c 32)
     echo "KEYCLOAK_PW=$KEYCLOAK_PW" >> $FILE
     echo "JITSI_ADMIN_PW=$JITSI_ADMIN_PW" >> $FILE
-    echo "WEBSOCKET_SECRET=$WEBSOCKET_SECRET" >> $FILE
+    echo "MERCURE_JWT_SECRET=$MERCURE_JWT_SECRET" >> $FILE
     echo "KEYCLOAK_ADMIN_PW=$KEYCLOAK_ADMIN_PW" >> $FILE
-    echo "KEYCLOAK_CLIENT_SECRET=$KEYCLOAK_CLIENT_SECRET" >> $FILE
+    echo "NEW_UUID=$NEW_UUID" >> $FILE
     source $FILE
 fi
   ENVIRONMENT=${ENVIRONMENT:=prod}
@@ -74,7 +74,7 @@ echo --- 1. Build the Keycloak ----------------------------------
 echo ------------------------------------------------------------
 echo ""
 cp .templates/realm-export.json keycloak/realm-export.json
-sed -i "s|<clientsecret>|$KEYCLOAK_CLIENT_SECRET|g" keycloak/realm-export.json
+sed -i "s|<clientsecret>|$NEW_UUID|g" keycloak/realm-export.json
 sed -i "s|<clientUrl>|$HTTP_METHOD://$PUBLIC_URL|g" keycloak/realm-export.json
 
 
@@ -103,7 +103,7 @@ laF_baseUrl='$HTTP_METHOD://$PUBLIC_URL'
 VICH_BASE='$HTTP_METHOD://$PUBLIC_URL'
 GIT_VERSION=1.0.12
 PUBLIC_URL='$PUBLIC_URL'
-OAUTH_KEYCLOAK_CLIENT_SECRET=$KEYCLOAK_CLIENT_SECRET
+OAUTH_KEYCLOAK_CLIENT_SECRET=$NEW_UUID
 OAUTH_KEYCLOAK_SERVER='$HTTP_METHOD://$PUBLIC_URL/keycloak'
 OAUTH_KEYCLOAK_CLIENT_ID=jitsiadmin
 OAUTH_KEYCLOAK_REALM=jitsiadmin
@@ -111,7 +111,7 @@ registerEmailAdress='notification@jitsi-admin.local'
 DEFAULT_LANGUAGE=$default_language
 MERCURE_URL='http://websocket-ja:3000/.well-known/mercure'
 MERCURE_PUBLIC_URL='$HTTP_METHOD://$PUBLIC_URL'
-WEBSOCKET_SECRET=$WEBSOCKET_SECRET
+WEBSOCKET_SECRET=$MERCURE_JWT_SECRET
 KEYCLOAK_ADMIN=admin
 KEYCLOAK_ADMIN_PASSWORD=$KEYCLOAK_ADMIN_PW
 KC_DB=mariadb