Merge branch 'master' of ssh://git.kaz.bzh:2202/KAZ/kaz

5 months ago · 7d4935a3ba
11 changed files with 245 additions and 9 deletions
--- a/bin/dns.sh
+++ b/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=""
--- a/bin/foreign-domain.sh
+++ b/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"
--- a/bin/kazList.sh
+++ b/bin/kazList.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+mi#!/bin/bash

 PRG=$(basename $0)
 SIMU=""
--- a/bin/migVersProd2.sh
+++ b/bin/migVersProd2.sh
@ -4,6 +4,9 @@ KAZ_ROOT=$(cd "$(dirname $0)/.."; pwd)
 . "${KAZ_ROOT}/bin/.commonFunctions.sh"
 setKazVars

+. $DOCKERS_ENV
+. $KAZ_ROOT/secret/SetAllPass.sh
+
 NAS_VOL="/mnt/disk-nas1/docker/volumes/"
 SITE_DST=prod2

--- a/bin/migVersProd3.sh
+++ b/bin/migVersProd3.sh
@ -0,0 +1,93 @@
+#!/bin/bash
+
+KAZ_ROOT=$(cd "$(dirname $0)/.."; pwd)
+. "${KAZ_ROOT}/bin/.commonFunctions.sh"
+setKazVars
+
+. $DOCKERS_ENV
+. $KAZ_ROOT/secret/SetAllPass.sh
+
+NAS_VOL="/mnt/disk-nas1/docker/volumes/"
+SITE_DST=kazoulet
+
+declare -a availableOrga
+availableOrga=($(getList "${KAZ_CONF_DIR}/container-orga.list"))
+
+export SIMU=""
+export COPY=""
+
+usage () {
+    echo "Usage: $0 [-n] [-copy] [orgas]..."
+    echo "    -h|--help	: this help"
+    echo "    -n		: simulation"
+    echo "    -copy	: only copy data but doesn't stop"
+    echo "    [orgas]	: in ${availableOrga[@]}"
+    echo "    example	: migVersProd2.sh -copy splann-orga && migVersProd2.sh splann-orga"
+    exit 1
+}
+
+for ARG in "$@"; do
+    case "${ARG}" in
+	'-h' | '--help' )
+	    usage
+	    exit 0
+	    ;;
+	'-n')
+	    SIMU="echo"
+	    ;;
+	'-copy')
+	    COPY="true"
+	    ;;
+	*)
+	    if [[ ! " ${availableOrga[@]} " =~ " ${ARG} " ]]; then
+	    	echo "Unknown orga: ${RED}${BOLD}${ARG}${NC} not in ${YELLOW}${BOLD}${availableOrga[*]}${NC}"
+		usage
+		exit 0
+	    fi
+	    Orgas="${Orgas} ${ARG}"
+    esac
+done
+
+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}.kaz.bzh "test -d ${DOCK_VOL_GAR_ORGA}/"; then
+	    echo "${RED}${BOLD}   ... can't move garadin to ${SITE_DST}${NC}"
+	    echo "    intall garrandin in ${SITE_DST} before!"
+	    continue
+	fi
+    fi
+
+    if [ -z "${COPY}" ]; then
+	cd "${KAZ_COMP_DIR}/${orgaLong}"
+	docker-compose logs --tail 100| grep $(date "+ %Y-%m-%d")
+	checkContinue
+	${SIMU} docker-compose down
+    fi
+
+    if [ $(ls -d ${NAS_VOL}/orga_${orgaCourt}-* 2>/dev/null | wc -l) -gt 0 ]; then
+	echo "${BLUE}${BOLD}   ... depuis nas${NC}"
+	${SIMU} rsync -aAhHX --info=progress2 --delete ${NAS_VOL}/orga_${orgaCourt}-* -e "ssh -p 2201" root@${SITE_DST}.kaz.bzh:${DOCK_VOL}
+    else
+	echo "${BLUE}${BOLD}   ... depuis disque${NC}"
+        ${SIMU} rsync -aAhHX --info=progress2 --delete ${DOCK_VOL}/orga_${orgaCourt}-* -e "ssh -p 2201" root@${SITE_DST}.kaz.bzh:${DOCK_VOL}
+    fi
+
+    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}.kaz.bzh:"${DOCK_VOL_GAR_ORGA}/"
+	fi
+	${SIMU} rsync -aAhHX --info=progress2 --delete ${KAZ_COMP_DIR}/${orgaLong} -e "ssh -p 2201" root@${SITE_DST}.kaz.bzh:${KAZ_COMP_DIR}/
+	${SIMU} ssh -p 2201 root@${SITE_DST}.kaz.bzh "grep -q '^${orgaLong}\$' /kaz/config/container-orga.list || echo ${orgaLong} >> /kaz/config/container-orga.list"
+	${SIMU} ssh -p 2201 root@${SITE_DST}.kaz.bzh ${KAZ_COMP_DIR}/${orgaLong}/init-volume.sh
+
+	cd "${KAZ_COMP_DIR}/${orgaLong}"
+	${SIMU} ./orga-rm.sh
+	${SIMU} ssh -p 2201 root@${SITE_DST}.kaz.bzh "${KAZ_COMP_DIR}/${orgaLong}/orga-gen.sh" --create
+	${SIMU} ssh -p 2201 root@${SITE_DST}.kaz.bzh "${KAZ_BIN_DIR}/container.sh" start "${orgaLong}"
+    fi
+done
--- a/bin/migVersProdX.sh
+++ b/bin/migVersProdX.sh
@ -0,0 +1,139 @@
+#!/bin/bash
+
+#koi: pouvoir migrer une orga (data+dns) depuis PROD1 vers PRODx 
+#kan: 07/12/2023
+#ki: françois puis fab (un peu)
+
+KAZ_ROOT=$(cd "$(dirname $0)/.."; pwd)
+. "${KAZ_ROOT}/bin/.commonFunctions.sh"
+setKazVars
+
+. $DOCKERS_ENV
+. $KAZ_ROOT/secret/SetAllPass.sh
+
+
+NAS_VOL="/mnt/disk-nas1/docker/volumes/"
+
+#TODO: ce tab doit être construit à partir de la liste des machines dispos et pas en dur
+tab_sites_destinations_possibles=("kazoulet" "prod2")
+
+#par défaut, on prend le premier site
+SITE_DST="${tab_sites_destinations_possibles[0]}"
+
+declare -a availableOrga
+availableOrga=($(getList "${KAZ_CONF_DIR}/container-orga.list"))
+
+export SIMU=""
+export COPY=""
+
+usage () {
+    echo "Usage: $0 [-n] [-d host_distant] [-c] [orga]...[orga]"
+    echo "    -h			: this help"
+    echo "    -d host_distant	: ${SITE_DST} par défaut"
+    echo "    -n			: simulation"
+    echo "    -c			: only copy data but doesn't stop"
+    echo "    [orgas]		: in ${availableOrga[@]}"
+    echo "    example		: migVersProdX.sh -d kazoulet -c splann-orga && migVersProdX.sh -d kazoulet splann-orga"
+    exit 1
+}
+
+while getopts "hncd:" option; do
+	case ${option} in
+	h)
+		usage
+		exit 0
+		;;	
+	n)
+		SIMU="echo"
+		;;
+	c)
+		COPY="true"
+		;;
+	d)
+		SITE_DST=${OPTARG}
+		;;		
+	esac
+done
+
+# site distant autorisé ?
+if [[ " ${tab_sites_destinations_possibles[*]} " == *" $SITE_DST "* ]]; then
+	true
+else
+	echo
+	echo "${RED}${BOLD}Sites distants possibles : ${tab_sites_destinations_possibles[@]}${NC}"
+	echo
+	usage
+	exit 0
+fi 
+
+# Récupérer les orgas dans un tableau
+shift $((OPTIND-1))
+Orgas=("$@")
+
+#ces orgas existent-elles sur PROD1 ?
+for orga in "${Orgas[@]}"; do
+	if [[ ! " ${availableOrga[@]} " =~ " ${orga} " ]]; then
+		echo
+		echo "Unknown orga: ${RED}${BOLD}${ARG}${orga}${NC}"
+		echo
+		usage
+		exit 0
+	fi
+done
+
+echo
+echo "Site distant: ${GREEN}${BOLD}${SITE_DST}${NC}"
+echo
+
+for orgaLong in ${Orgas}; do
+    orgaCourt="${orgaLong%-orga}"
+    orgaLong="${orgaCourt}-orga"
+    echo "${BLUE}${BOLD}migration de ${orgaCourt}${NC}"
+
+# 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 mais commandé
+	if [ -f "${KAZ_COMP_DIR}/${orgaLong}/usePaheko" ]; then
+		${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "mkdir -p ${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt} && chown www-data:www-data ${DOCK_VOL_PAHEKO_ORGA}/${orgaCourt}"          
+		
+		#ensuite, on peut refaire la liste des routes paheko pour traefik
+		${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "cd ${KAZ_COMP_DIR}/paheko/ && ./docker-compose-gen.sh"      
+	fi
+		
+    if [ -z "${COPY}" ]; then
+	cd "${KAZ_COMP_DIR}/${orgaLong}"
+	docker-compose logs --tail 100| grep $(date "+ %Y-%m-%d")
+	checkContinue
+	${SIMU} docker-compose down
+    fi
+
+    if [ $(ls -d ${NAS_VOL}/orga_${orgaCourt}-* 2>/dev/null | wc -l) -gt 0 ]; then
+	echo "${BLUE}${BOLD}   ... depuis nas${NC}"
+	${SIMU} rsync -aAhHX --info=progress2 --delete ${NAS_VOL}/orga_${orgaCourt}-* -e "ssh -p 2201" root@${SITE_DST}.${domain}:${DOCK_VOL}
+    else
+	echo "${BLUE}${BOLD}   ... depuis disque${NC}"
+        ${SIMU} rsync -aAhHX --info=progress2 --delete ${DOCK_VOL}/orga_${orgaCourt}-* -e "ssh -p 2201" root@${SITE_DST}.${domain}:${DOCK_VOL}
+    fi
+
+    if [ -z "${COPY}" ]; then
+	echo "${BLUE}${BOLD}   ... config${NC}"
+	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"
+	${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} ${KAZ_COMP_DIR}/${orgaLong}/init-volume.sh
+
+	cd "${KAZ_COMP_DIR}/${orgaLong}"
+	${SIMU} ./orga-rm.sh
+	${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "${KAZ_COMP_DIR}/${orgaLong}/orga-gen.sh" --create
+	${SIMU} ssh -p 2201 root@${SITE_DST}.${domain} "${KAZ_BIN_DIR}/container.sh" start "${orgaLong}"
+    fi
+done
--- a/config/orgaTmpl/docker-compose.yml
+++ b/config/orgaTmpl/docker-compose.yml
@ -17,7 +17,7 @@ services:
      - /etc/timezone:/etc/timezone:ro
    env_file:
      - ../../secret/env-${nextcloudDBName}
-      - ../../secret/env-${mattermostDBName}
+#      - ../../secret/env-${mattermostDBName}
      - ../../secret/env-${wordpressDBName}
    networks:
      - orgaNet
--- a/config/orgaTmpl/init-paheko.sh
+++ b/config/orgaTmpl/init-paheko.sh
@ -24,4 +24,4 @@ fi

 printKazMsg "init paheko ${ORGA}"

-${KAZ_COMP_DIR}/paheko/installPlugins.sh ${ORGA}
+#${KAZ_COMP_DIR}/paheko/installPlugins.sh ${ORGA}
--- a/config/orgaTmpl/orga-rm.sh
+++ b/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
--- a/dockers/paheko/config/config.local.tmpl.php
+++ b/dockers/paheko/config/config.local.tmpl.php
@ -126,4 +126,4 @@ define('Paheko\SHOW_ERRORS', true);

 #add by fab le 21/04/2022
 //const PDF_COMMAND = 'prince';
-const PDF_COMMAND = 'auto;
+const PDF_COMMAND = 'auto';
--- a/dockers/traefik/docker-compose.tmpl.yml.dist
+++ b/dockers/traefik/docker-compose.tmpl.yml.dist
@ -3,8 +3,9 @@ version: '3'
 services:
  reverse-proxy:
    # The official v2 Traefik docker image
-    image: traefik:v2.10.6
+    image: traefik:v2.10.7
    container_name: ${traefikServName}
+    restart: ${restartPolicy}
    # Enables the web UI and tells Traefik to listen to docker
    ports:
      # The HTTP port