From a6f4949e1e4c2610f9b04e643a0179fdebb8d4f5 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Wed, 15 Nov 2023 11:48:03 +0100
Subject: [PATCH] svg

---
 docker/env/.env               | 14 ++++-----
 docker/env/.env.zapp.ninegate |  2 +-
 docker/envole.sh              | 54 +++++++++++++++++++----------------
 tmpl/envole-ninegate.env      |  1 +
 tmpl/envole.env               |  2 +-
 5 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/docker/env/.env b/docker/env/.env
index 35eaf38..2ff708d 100644
--- a/docker/env/.env
+++ b/docker/env/.env
@@ -72,40 +72,40 @@ CAS_PASSWORD=${ADMIN_PASSWORD}-keycloak
 CAS_HOST=keycloak
 CAS_PORT=8443
 CAS_PATH=/auth/realms/envole/protocol/cas
-CAS_URL=${WEB_PROTOCOL}://${CAS_HOST}:${CAS_PORT}
+CAS_URL=${PROTOCOLE}://${CAS_HOST}:${CAS_PORT}
 
 # NINEGATE
 NINEGATE_SERVICE_NAME=ninegate
 NINEGATE_ACTIVATE=1
 NINEGATE_LOCAL=1
-NINEGATE_URL=${WEB_PROTOCOL}://${WEB_URL}:9000
+NINEGATE_URL=${PROTOCOLE}://${WEB_URL}:9000
 
 # NINEGATE
 NEXTCLOUD_SERVICE_NAME=nextcloud
 NEXTCLOUD_ACTIVATE=0
 NEXTCLOUD_LOCAL=1
-NEXTCLOUD_URL=${WEB_PROTOCOL}://${WEB_URL}:9001
+NEXTCLOUD_URL=${PROTOCOLE}://${WEB_URL}:9001
 NEXTCLOUD_SAMBA=0
 
 # ADMINER
 ADMINER_SERVICE_NAME=adminer
 ADMINER_ACTIVATE=0
 ADMINER_LOCAL=1
-ADMINER_URL=${WEB_PROTOCOL}://${WEB_URL}:9100/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}
+ADMINER_URL=${PROTOCOLE}://${WEB_URL}:9100/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}
 
 # PHPLDAPADMIN
 PHPLDAPADMIN_SERVICE_NAME=phpldapadmin
 PHPLDAPADMIN_ACTIVATE=0
 PHPLDAPADMIN_LOCAL=1
-PHPLDAPADMIN_URL=${WEB_PROTOCOL}://${WEB_URL}:9101
+PHPLDAPADMIN_URL=${PROTOCOLE}://${WEB_URL}:9101
 
 # GENCONFIG
 GENCONFIG_ACTIVATE=0
-GENCONFIG_URL=${WEB_PROTOCOL}://${WEB_URL}:9102
+GENCONFIG_URL=${PROTOCOLE}://${WEB_URL}:9102
 
 # NINEAPACHE
 NINEAPACHE_SERVICE_NAME=nineapache
 NINEAPACHE_ACTIVATE=0
 NINEAPACHE_LOCAL=1
-NINEAPACHE_URL=${WEB_PROTOCOL}://${WEB_URL}:9102
+NINEAPACHE_URL=${PROTOCOLE}://${WEB_URL}:9102
 
diff --git a/docker/env/.env.zapp.ninegate b/docker/env/.env.zapp.ninegate
index 12bc379..da1facb 100644
--- a/docker/env/.env.zapp.ninegate
+++ b/docker/env/.env.zapp.ninegate
@@ -3,7 +3,7 @@
 
 # Activation Widget
 ACTIVATE_WIDADMINER=${ADMINER_ACTIVATE}
-WIDADMINER_URL=${ADMINER_URL}
+WIDADMINER_URL="${ADMINER_URL}"
 
 ACTIVATE_WIDPHPLDAPADMIN=${PHPLDAPADMIN_ACTIVATE}
 WIDPHPLDAPADMIN_URL=${PHPLDAPADMIN_URL}
diff --git a/docker/envole.sh b/docker/envole.sh
index b9b422e..543ac61 100755
--- a/docker/envole.sh
+++ b/docker/envole.sh
@@ -15,37 +15,40 @@ cat ./env/.env* >> ./.env.local
 BigTitle "ENVOLE"
 
 # on remplace les valeur reprise dans les autres .env car podman interprète mal
-sed -i 's#${WEB_URL}#'${WEB_URL}'#g' ./.env.local
-sed -i 's#${WEB_PROTOCOL}#'${WEB_PROTOCOL}'#g' ./.env.local
-. ./.env.local
+if [[ "$PODCOMPOSEBIN" == "podman-compose" ]]
+then 
+    sed -i 's#${WEB_URL}#'${WEB_URL}'#g' ./.env.local
+    sed -i 's#${WEB_PROTOCOL}#'${WEB_PROTOCOL}'#g' ./.env.local
+    . ./.env.local
 
-sed -i 's#${ADMIN_PASSWORD}#'${ADMIN_PASSWORD}'#g' ./.env.local
-sed -i 's#${ADMIN_USER}#'${ADMIN_USER}'#g' ./.env.local
+    sed -i 's#${ADMIN_PASSWORD}#'${ADMIN_PASSWORD}'#g' ./.env.local
+    sed -i 's#${ADMIN_USER}#'${ADMIN_USER}'#g' ./.env.local
 
-sed -i 's#${CAS_HOST}#'${CAS_HOST}'#g' ./.env.local
-sed -i 's#${CAS_PORT}#'${CAS_PORT}'#g' ./.env.local
-sed -i 's#${CAS_USER}#'${CAS_USER}'#g' ./.env.local
-sed -i 's#${CAS_PASSWORD}#'${CAS_PASSWORD}'#g' ./.env.local
+    sed -i 's#${CAS_HOST}#'${CAS_HOST}'#g' ./.env.local
+    sed -i 's#${CAS_PORT}#'${CAS_PORT}'#g' ./.env.local
+    sed -i 's#${CAS_USER}#'${CAS_USER}'#g' ./.env.local
+    sed -i 's#${CAS_PASSWORD}#'${CAS_PASSWORD}'#g' ./.env.local
 
-sed -i 's#${LDAP_SERVICE_NAME}#'${LDAP_SERVICE_NAME}'#g' ./.env.local
-sed -i 's#${LDAP_ADMIN_USERNAME}#'${LDAP_ADMIN_USERNAME}'#g' ./.env.local
-sed -i 's#${LDAP_BASEDN}#'${LDAP_BASEDN}'#g' ./.env.local
-sed -i 's#${LDAP_PASSWORD}#'${LDAP_PASSWORD}'#g' ./.env.local
-sed -i 's#${LDAP_USER}#'${LDAP_USER}'#g' ./.env.local
-sed -i 's#${LDAP_PORT}#'${LDAP_PORT}'#g' ./.env.local
+    sed -i 's#${LDAP_SERVICE_NAME}#'${LDAP_SERVICE_NAME}'#g' ./.env.local
+    sed -i 's#${LDAP_ADMIN_USERNAME}#'${LDAP_ADMIN_USERNAME}'#g' ./.env.local
+    sed -i 's#${LDAP_BASEDN}#'${LDAP_BASEDN}'#g' ./.env.local
+    sed -i 's#${LDAP_PASSWORD}#'${LDAP_PASSWORD}'#g' ./.env.local
+    sed -i 's#${LDAP_USER}#'${LDAP_USER}'#g' ./.env.local
+    sed -i 's#${LDAP_PORT}#'${LDAP_PORT}'#g' ./.env.local
 
-sed -i 's#${MARIADB_SERVICE_NAME}#'${MARIADB_SERVICE_NAME}'#g' ./.env.local
-sed -i 's#${MARIADB_USER}#'${MARIADB_USER}'#g' ./.env.local
-sed -i 's#${MARIADB_PASSWORD}#'${MARIADB_PASSWORD}'#g' ./.env.local
+    sed -i 's#${MARIADB_SERVICE_NAME}#'${MARIADB_SERVICE_NAME}'#g' ./.env.local
+    sed -i 's#${MARIADB_USER}#'${MARIADB_USER}'#g' ./.env.local
+    sed -i 's#${MARIADB_PASSWORD}#'${MARIADB_PASSWORD}'#g' ./.env.local
 
-sed -i 's#${ADMINER_ACTIVATE}#'${ADMINER_ACTIVATE}'#g' ./.env.local
-sed -i 's#${ADMINER_URL}#'${ADMINER_URL}'#g' ./.env.local
+    sed -i 's#${ADMINER_ACTIVATE}#'${ADMINER_ACTIVATE}'#g' ./.env.local
+    sed -i 's#${ADMINER_URL}#'${ADMINER_URL}'#g' ./.env.local
 
-sed -i 's#${PHPLDAPADMIN_ACTIVATE}#'${PHPLDAPADMIN_ACTIVATE}'#g' ./.env.local
-sed -i 's#${PHPLDAPADMIN_URL}#'${PHPLDAPADMIN_URL}'#g' ./.env.local
+    sed -i 's#${PHPLDAPADMIN_ACTIVATE}#'${PHPLDAPADMIN_ACTIVATE}'#g' ./.env.local
+    sed -i 's#${PHPLDAPADMIN_URL}#'${PHPLDAPADMIN_URL}'#g' ./.env.local
 
-sed -i 's#${NEXTCLOUD_ACTIVATE}#'${NEXTCLOUD_ACTIVATE}'#g' ./.env.local
-sed -i 's#${NEXTCLOUD_URL}#'${NEXTCLOUD_URL}'#g' ./.env.local
+    sed -i 's#${NEXTCLOUD_ACTIVATE}#'${NEXTCLOUD_ACTIVATE}'#g' ./.env.local
+    sed -i 's#${NEXTCLOUD_URL}#'${NEXTCLOUD_URL}'#g' ./.env.local
+fi
 
 # Include
 . ./.env.local
@@ -165,6 +168,7 @@ up(){
             
             upservice $LDAP_SERVICE_NAME
             $PODCOMPOSEBIN exec $LDAP_SERVICE_NAME /envole/init.sh
+            echo
         fi
 
         # CAS
@@ -172,6 +176,7 @@ up(){
         then
             Title ${CAS_SERVICE_NAME^^}
             upservice $CAS_SERVICE_NAME
+            echo
         fi
 
         # NINEGATE
@@ -179,6 +184,7 @@ up(){
         then
             Title ${NINEGATE_SERVICE_NAME^^}
             upservice ${NINEGATE_SERVICE_NAME}
+            chmod -R a+wr ./volume/ninegate/data
             echo
         fi
 
diff --git a/tmpl/envole-ninegate.env b/tmpl/envole-ninegate.env
index 302e7f3..b97335f 100644
--- a/tmpl/envole-ninegate.env
+++ b/tmpl/envole-ninegate.env
@@ -4,3 +4,4 @@
 ALIAS=ninegate/
 FORCE_THEME=%%getBool(%%getVar("ninegate_forcetheme", "non"))
 FORCE_THEMENAME=%%getVar("ninegate_forcethemename", "")
+
diff --git a/tmpl/envole.env b/tmpl/envole.env
index 40e66ba..9121a07 100644
--- a/tmpl/envole.env
+++ b/tmpl/envole.env
@@ -67,7 +67,7 @@ NEXTCLOUD_URL=%%getVar("nextcloud_url", "/nextcloud")
 # ADMINER
 ADMINER_ACTIVATE=%%getBool(%%getVar("activer_adminer", "non"))
 ADMINER_LOCAL=1
-ADMINER_URL=/adminer/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}
+ADMINER_URL="${PROTOCOLE}://${WEB_URL}/adminer/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}"
 
 # PHPLDAPADMIN
 PHPLDAPADMIN_ACTIVATE=%%getBool(%%getVar("activer_phpldapadmin", "non"))