From ea817aba478731456fc82e3b8e7a3a8a04f99d07 Mon Sep 17 00:00:00 2001
From: Gael <gael.merbeth@kaz.bzh>
Date: Wed, 3 Sep 2025 22:57:03 +0200
Subject: [PATCH] Pb init wp et wiki.

---
 bin/manageWiki.sh | 6 +++++-
 bin/manageWp.sh   | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bin/manageWiki.sh b/bin/manageWiki.sh
index 3f7d693..ada5a9e 100755
--- a/bin/manageWiki.sh
+++ b/bin/manageWiki.sh
@@ -54,7 +54,11 @@ Init(){
     PLG_DIR="${VOL_PREFIX}wikiPlugins/_data"
     CONF_DIR="${VOL_PREFIX}wikiConf/_data"
 
-    . $KAZ_BIN_DIR/getPasswords.sh dokuwiki
+    if [ -n "$WIKICOMMUN" ]; then 
+        . $KAZ_BIN_DIR/getPasswords.sh dokuwiki
+    else
+        . $KAZ_BIN_DIR/getPasswords.sh -d ${ORGA} dokuwiki
+    fi
 
     ${SIMU} checkDockerRunning "${DockerServName}" "${NOM}" || exit
 
diff --git a/bin/manageWp.sh b/bin/manageWp.sh
index b404a2c..c6858be 100755
--- a/bin/manageWp.sh
+++ b/bin/manageWp.sh
@@ -60,7 +60,14 @@ Init(){
     echo "\n  *** Premier lancement de WP" >& $QUIET
 
     ${SIMU} waitUrl "${WP_URL}"
-    . $KAZ_BIN_DIR/getPasswords.sh wpServ
+
+
+    if [ -n "$WIKICOMMUN" ]; then 
+        . $KAZ_BIN_DIR/getPasswords.sh wpServ
+    else
+        . $KAZ_BIN_DIR/getPasswords.sh -d ${ORGA} wpServ
+    fi
+
     ${SIMU} curl -X POST \
         -d "user_name=${wpServ_WORDPRESS_ADMIN_USER}" \
         -d "admin_password=${wpServ_WORDPRESS_ADMIN_PASSWORD}" \