remplace garHost par pahekoHost et corriger migVersProdX

bin/dns.sh

@@ -16,7 +16,7 @@ export ETC_HOSTS="/etc/hosts"
 export $(set | grep "domain=")
 
 declare -a forbidenName
-forbidenName=(${calcHost} calc ${cloudHost} bureau ${dateHost} date ${dokuwikiHost} dokuwiki ${fileHost} file ${ldapHost} ${garHost} ${gitHost} ${gravHost} ${matterHost} ${officeHost} collabora ${padHost} ${sympaHost} listes ${webmailHost} ${wordpressHost} www ${vigiloHost} form)
+forbidenName=(${calcHost} calc ${cloudHost} bureau ${dateHost} date ${dokuwikiHost} dokuwiki ${fileHost} file ${ldapHost} ${pahekoHost} ${gitHost} ${gravHost} ${matterHost} ${officeHost} collabora ${padHost} ${sympaHost} listes ${webmailHost} ${wordpressHost} www ${vigiloHost} form)
 
 export FORCE="NO"
 export CMD=""

bin/foreign-domain.sh

@@ -14,7 +14,7 @@ cd $(dirname $0)
 LETS_DIR="/etc/letsencrypt/$([ "${mode}" == "local" ] && echo "local" || echo "live")"
 
 declare -a availableComposes availableOrga
-availableComposes=(${garHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost})
+availableComposes=(${pahekoHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost})
 availableOrga=($(sed -e "s/\(.*\)[ \t]*#.*$/\1/" -e "s/^[ \t]*\(.*\)-orga$/\1/" -e "/^$/d" "${KAZ_CONF_DIR}/container-orga.list"))
 availableProxyComposes=($(getList "${KAZ_CONF_DIR}/container-proxy.list"))
 
@@ -27,7 +27,7 @@ export CHANGE=""
 
 usage(){
     echo "Usage: ${PRG} list [friend-domain...]"
-    echo "       ${PRG} [-n] add orga [${garHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost}] [friend-domain...] "
+    echo "       ${PRG} [-n] add orga [${pahekoHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost}] [friend-domain...] "
     echo "       ${PRG} [-n] del [friend-domain...]"
     echo "       ${PRG} -l"
     echo "  -l short list"

bin/migVersProdX.sh

@@ -37,22 +37,21 @@ usage () {
     exit 1
 }
 
-
-while getopts ":h:d:n:c:" option; do
-	case "${option}" in
+while getopts "hncd:" option; do
+	case ${option} in
 	h)
 		usage
 		exit 0
 		;;	
-	d)
-		SITE_DST=${OPTARG}
-		;;
 	n)
 		SIMU="echo"
 		;;
 	c)
 		COPY="true"
 		;;
+	d)
+		SITE_DST=${OPTARG}
+		;;		
 	esac
 done
 
@@ -67,7 +66,6 @@ else
 	exit 0
 fi 
 
-
 # Récupérer les orgas dans un tableau
 shift $((OPTIND-1))
 Orgas=("$@")
@@ -87,18 +85,26 @@ echo
 echo "Site distant: ${GREEN}${BOLD}${SITE_DST}${NC}"
 echo
 
+exit
+
 for orgaLong in ${Orgas}; do
     orgaCourt="${orgaLong%-orga}"
     orgaLong="${orgaCourt}-orga"
     echo "${BLUE}${BOLD}migration de ${orgaCourt}${NC}"
 
-    if [ -d "${DOCK_VOL_GAR_ORGA}/${orgaCourt}" ]; then
-	if ! ssh -p 2201 root@${SITE_DST}.${domain} "test -d ${DOCK_VOL_GAR_ORGA}/"; then
-	    echo "${RED}${BOLD}   ... can't move paheko to ${SITE_DST}${NC}"
-	    echo "    intall paheko in ${SITE_DST}.${domain} before!"
-	    continue
-	fi
-    fi
+# if [ -d "${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt}" ]; then
+# 	if ! ssh -p 2201 root@${SITE_DST}.${domain} "test -d ${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt}"; then
+# 	    echo "${RED}${BOLD}   ... can't move paheko to ${SITE_DST}${NC}"
+# 	    echo "    intall paheko in ${SITE_DST}.${domain} before!"
+# 	    continue
+# 	fi
+# fi
+
+		#on créé le répertoire de l'orga pour paheko sur SITE_DST s'il n'existe pas
+		#pratique quand paheko n'est pas encore installé sur PROD1
+		${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "mkdir -p ${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt}"	    	
+		#ensuite, on peut refaire la liste des routes paheko pour traefik
+		${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "/kaz/dockers/paheko/docker-compose-gen.sh"	    
 
     if [ -z "${COPY}" ]; then
 	cd "${KAZ_COMP_DIR}/${orgaLong}"
@@ -117,8 +123,8 @@ for orgaLong in ${Orgas}; do
 
     if [ -z "${COPY}" ]; then
 	echo "${BLUE}${BOLD}   ... config${NC}"
-	if [ -d "${DOCK_VOL_GAR_ORGA}/${orgaCourt}" ]; then
-	    ${SIMU} rsync -aAhHX --info=progress2 --delete "${DOCK_VOL_GAR_ORGA}/${orgaCourt}" -e "ssh -p 2201" root@${SITE_DST}.${domain}:"${DOCK_VOL_GAR_ORGA}/"
+	if [ -d "${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt}" ]; then
+	    ${SIMU} rsync -aAhHX --info=progress2 --delete "${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt}" -e "ssh -p 2201" root@${SITE_DST}.${domain}:"${DOCK_VOL_PAHEKO_ORGA}/"
 	fi
 	${SIMU} rsync -aAhHX --info=progress2 --delete ${KAZ_COMP_DIR}/${orgaLong} -e "ssh -p 2201" root@${SITE_DST}.${domain}:${KAZ_COMP_DIR}/
 	${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "grep -q '^${orgaLong}\$' /kaz/config/container-orga.list || echo ${orgaLong} >> /kaz/config/container-orga.list"

config/orgaTmpl/orga-rm.sh

@@ -31,7 +31,7 @@ remove () {
 			fi
 		done
 	    DEL_DOMAIN=""
-	    for serv in ${garHost} ${cloudHost} ${officeHost} ${dokuwikiHost} ${wordpressHost} ${matterHost}
+	    for serv in ${pahekoHost} ${cloudHost} ${officeHost} ${dokuwikiHost} ${wordpressHost} ${matterHost}
 	    do
 	     	DEL_DOMAIN+="${ORGA}-${serv} "
 	    done