Pb init wp et wiki.

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
 

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}" \