From 047723fa92b60f93806fe440017896aa01486dca Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 1 Mar 2024 15:49:55 +0100 Subject: [PATCH] svg --- docker/env/.env | 8 ++++++-- docker/env/.env.zapp.keycloak | 2 +- docker/volume/keycloak/envole/realm-export.json | 8 ++++---- tmpl/envole-apache.conf | 3 +++ tmpl/envole.env | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docker/env/.env b/docker/env/.env index 85d248f..845fe0e 100644 --- a/docker/env/.env +++ b/docker/env/.env @@ -1,11 +1,16 @@ # == GLOBAL =============================================================================================================================== +# ATTENTION +# si vous souhaiter faire tourner envole sur localhost vous devez ajouter dans votre host = 127.0.0.0 envole.local +# si vous changer le web_url penser à modifier envole.local par votre web_url dans volume/keycloak/envole/realm-export.json +# sinon il vous faudra vous connecter à keycloak pour changer l'url du client envole + # RELEASE SYSTEM = linux ou eole si eole le réseau du compose sera supprimé et regénéré à chaque UP RELEASE_SYSTEM=linux # GLOBAL APP_ENV=PROD -WEB_URL=localhost +WEB_URL=envole.local PROTOCOLE=http # ADMIN USER @@ -63,7 +68,6 @@ OPENLDAPSYNCHROGROUP=0 OPENLDAPREQGROUP= # CAS -# attention si localhost = ajouter keycloak dans votre propre host : le service web doit valider son ticket via le nom du service et votre navigateur doit assi le voir KEYCLOAK_SERVICE_NAME=keycloak CAS_ACTIVATE=1 CAS_LOCAL=1 diff --git a/docker/env/.env.zapp.keycloak b/docker/env/.env.zapp.keycloak index be3f023..de07a5c 100644 --- a/docker/env/.env.zapp.keycloak +++ b/docker/env/.env.zapp.keycloak @@ -12,4 +12,4 @@ DB_PASSWORD=${MARIADB_PASSWORD} KC_HTTPS_CERTIFICATE_FILE=/envole/server.crt.pem KC_HTTPS_CERTIFICATE_KEY_FILE=/envole/server.key.pem KEYCLOAK_IMPORT=/envole/realm-export.json - +PROXY_ADDRESS_FORWARDING= 'true' diff --git a/docker/volume/keycloak/envole/realm-export.json b/docker/volume/keycloak/envole/realm-export.json index 978a0d7..b02fddb 100644 --- a/docker/volume/keycloak/envole/realm-export.json +++ b/docker/volume/keycloak/envole/realm-export.json @@ -435,16 +435,16 @@ "id": "133d3397-41e7-4ec1-aaf0-a0939da72f58", "clientId": "envole", "name": "envole", - "rootUrl": "https://eolebase.ac-test.fr", - "baseUrl": "https://eolebase.ac-test.fr", + "rootUrl": "https://envole.local", + "baseUrl": "https://envole.local", "surrogateAuthRequired": false, "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", "secret": "**********", "redirectUris": [ - "http://eolebase.ac-test.fr*", - "https://eolebase.ac-test.fr*" + "http://envole.local*", + "https://envole.local*" ], "webOrigins": [], "notBefore": 0, diff --git a/tmpl/envole-apache.conf b/tmpl/envole-apache.conf index 1be53df..f98d177 100644 --- a/tmpl/envole-apache.conf +++ b/tmpl/envole-apache.conf @@ -1,3 +1,6 @@ +ProxyPass /auth http://0.0.0.0:8080/auth retry=0 keepalive=On +ProxyPassReverse /auth http://0.0.0.0:8080/auth retry=0 + ProxyPass /ninegate http://0.0.0.0:9000/ninegate retry=0 keepalive=On ProxyPassReverse /ninegate http://0.0.0.0:9000/ninegate retry=0 ProxyPass /wssninegate ws://0.0.0.0:9000/wssninegate retry=0 keepalive=On diff --git a/tmpl/envole.env b/tmpl/envole.env index 363fd16..842581f 100644 --- a/tmpl/envole.env +++ b/tmpl/envole.env @@ -50,9 +50,9 @@ CAS_ACTIVATE=0 %end if CAS_LOCAL=%%getBool(%%getVar("cas_local", "non")) CAS_HOST=%%getVar("cas_host", %%getVar("web_url")) -CAS_PORT=%%getVar("cas_port", "8443") +CAS_PORT=%%getVar("cas_port", "443") CAS_PATH=%%getVar("cas_path", "/auth/realms/envole/protocol/cas") -CAS_URL=https://%%getVar("cas_host", %%getVar("web_url")):%%getVar("cas_port", "8443") +CAS_URL=https://%%getVar("cas_host", %%getVar("web_url")):%%getVar("cas_port", "443") CAS_PASSWORD=%%getVar("keycload_userpassword", "") # NINEGATE