diff --git a/bin/container.sh b/bin/container.sh index 57bb016..7f58791 100755 --- a/bin/container.sh +++ b/bin/container.sh @@ -4,7 +4,7 @@ #Kan: 2021 #Koi: gestion dockers -# 15/01/2025: Dernière modif by fab: ne pas redémarrer Traefik en cas de créaio d'orga +# 15/01/2025: Dernière modif by fab: ne pas redémarrer Traefik en cas de créaio d'orga # Did : 13 fevrier 2025 modif des save en postgres et mysql # Did : ajout des sauvegardes de mobilizon et mattermost en postgres @@ -129,7 +129,7 @@ enableComposesNeedMail=() enableProxyComposes=() startComposes () { - ./kazDockerNet.sh add ${enableComposesNoNeedMail[@]} ${enableProxyComposes[@]} ${enableMailComposes[@]} ${enableComposesNeedMail[@]} + ./kazDockerNet.sh add ${enableComposesNoNeedMail[@]} ${enableProxyComposes[@]} ${enableMailComposes[@]} ${enableComposesNeedMail[@]} [ ${#enableComposesNeedMail[@]} -ne 0 ] && [[ ! "${enableMailComposes[@]}" =~ "postfix" ]] && ./kazDockerNet.sh add postfix [[ "${enableComposesNeedMail[@]}" =~ "paheko" ]] && ${SIMU} ${KAZ_COMP_DIR}/paheko/paheko-gen.sh doComposes "up -d" ${enableComposesNoNeedMail[@]} @@ -168,7 +168,7 @@ saveComposes () { savedComposes+=( ${enableProxyComposes[@]} ) savedComposes+=( ${enableComposesNoNeedMail[@]} ) savedComposes+=( ${enableComposesNeedMail[@]} ) - + for compose in ${savedComposes[@]} do case "${compose}" in @@ -203,11 +203,11 @@ saveComposes () { ;; paheko) # rien à faire (fichiers) - ;; + ;; mattermost) echo "save mattermost" . $KAZ_KEY_DIR/env-mattermostDB - saveDB matterPG "${DB_POSTGRES_USER}" "${DB_POSTGRES_PASSWORD}" "${DB_POSTGRES_DB}" mattermost postgres + saveDB matterPG "${POSTGRES_USER}" "${POSTGRES_PASSWORD}" "${POSTGRES_DB}" mattermost postgres ;; mobilizon) echo "save mobilizon" @@ -228,7 +228,7 @@ saveComposes () { echo "save roundcube" . $KAZ_KEY_DIR/env-roundcubeDB saveDB ${roundcubeDBName} "${DB_MYSQL_USER}" "${DB_MYSQL_PASSWORD}" "${DB_MYSQL_DATABASE}" roundcube mysql - ;; + ;; vaultwarden) echo "save vaultwarden" . $KAZ_KEY_DIR/env-vaultwardenDB @@ -239,7 +239,7 @@ saveComposes () { ;; *-orga) ORGA=${compose%-orga} - echo "save ${ORGA}" + echo "save ${ORGA}" if grep -q "cloud:" "${KAZ_COMP_DIR}/${compose}/docker-compose.yml" 2> /dev/null ; then echo " => cloud" . $KAZ_KEY_DIR/orgas/$ORGA/env-nextcloudDB @@ -286,7 +286,7 @@ case "$1" in DCK_CMD="startComposes" shift ;; - + stop) DCK_CMD="stopComposes" shift