divers synchro prod

bin/.commonFunctions.sh

@@ -69,15 +69,6 @@ checkContinue () {
     done
 }
 
-checkDockerRunning () {
-    # $1 docker name
-    # $2 service name
-    if ! [[ "$(docker ps -f "name=$1" | grep -w "$1")" ]]; then
-	printKazError "$2 not running... abort"
-	return 1
-    fi
-    return 0
-}
 
 ########################################
 testValidIp () {
@@ -208,34 +199,6 @@ waitUrl () {
 }
 
 ########################################
-downloadFile () {
-    # $1 URL to download
-    # $2 new filename (optional)
-    if [ $# -lt 1 ] || [ $# -gt 2 ]; then
-	printKazError "downloadFile: bad arg number"
-	return
-    fi
-    URL=$1
-    if [ -z "$2" ]; then
-	FILENAME="$(basename $1)"
-    else
-	FILENAME="$2"
-    fi
-
-    if [ ! -f "${FILENAME}" ]; then
-	printKazMsg "  - load ${URL}"
-	curl -L -o "${FILENAME}" "${URL}"
-    else
-	TMP="${FILENAME}.tmp"
-	rm -f "${TMP}"
-	curl -L -o "${TMP}" "${URL}"
-	if ! cmp -s "${TMP}" "${FILENAME}" 2>/dev/null; then
-	    mv "${TMP}" "${FILENAME}"
-	else
-	    rm -f "${TMP}"
-	fi
-    fi
-}
 
 unzipInDir () {
     # $1 zipfile

bin/cloudOrgas.sh

@@ -14,7 +14,7 @@ setKazVars
 PRG=$(basename $0)
 RACINE=$(echo $PRG | awk '{print $1}')
 
-TEMPO_ACTION_STOP=5
+TEMPO_ACTION_STOP=2
 TEMPO_ACTION_START=10
 LIST_CLOUDS=$(ls  /var/lib/docker/volumes/ | grep -i orga | grep -i cloudMain| sed -e 's/-cloudMain$//g' | sed -e 's/^orga_//')
 NB_CLOUDS=$(ls  /var/lib/docker/volumes/ | grep -i orga | grep -i cloudMain| sed -e 's/-cloudMain$//g' | sed -e 's/^orga_//' | wc -l )
@@ -46,6 +46,7 @@ Optimise_Cloud() {
         	echo -e "$RED${CLOUD} (${COMPTEUR}/${NB_CLOUDS}) "
         	echo -e "$GREEN execution de :occ db:add-missing-indices"
         	docker exec -ti -u 33 ${CLOUD}-nextcloudServ /var/www/html/occ db:add-missing-indices
+                docker exec -ti -u 33 ${CLOUD}-nextcloudServ /var/www/html/occ db:convert-filecache-bigint --no-interaction
                 COMPTEUR=$(expr ${COMPTEUR} - 1)
 	done
 	echo "${NC}"

bin/cron-garradin.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-KAZ_ROOT=$(cd "$(dirname $0)"/..; pwd)
-. $KAZ_ROOT/bin/.commonFunctions.sh
-setKazVars
-
-. $DOCKERS_ENV
-. $KAZ_ROOT/secret/SetAllPass.sh
-
-URL_AGORA=$(echo $matterHost).$(echo $domain)
-
-docker exec -ti ${mattermostServName} bin/mmctl auth login $httpProto://$URL_AGORA --name local-server --username $mattermost_user --password $mattermost_pass >/dev/null 2>&1
-MESSAGE_GARRADIN=$( ${KAZ_ROOT}/bin/verif_garradin.sh mono)
-docker exec -ti mattermostServ bin/mmctl post create kaz:collegiale --message "$MESSAGE_GARRADIN" >/dev/null 2>&1

bin/gestUsers.sh

@@ -262,6 +262,11 @@ Hello,
 
 le nouveau mot de passe de ${COMPTE_A_MODIFIER} est : ${PASSWORD} 
 
+Le webmail est disponible à https://webmail.kaz.bzh
+Le site d' aide pour la configuration des services : https://wiki.kaz.bzh
+Le site Web de Kaz : https://kaz.bzh
+Le mail de la collégiale : contact@kaz.bzh
+
 A bientôt"
 				docker exec -i mailServ mailx -a 'Content-Type: text/plain; charset="UTF-8"' -r admin@${domain} -s "Modification du compte" $MAIL_SECOURS << EOF 
 				${MAIL_CHANG}

bin/indicateurs.sh

@@ -74,4 +74,4 @@ for i in $(docker container ls --format "{{.ID}}"); do docker inspect -f '{{.Sta
 
 #fab le 04/10/2022
 #taille des dockers
-docker system df -v > > "${KAZ_STATE_DIR}/metro/$(date +"%Y%m%d")_docker_size_kaz.log"
+docker system df -v > "${KAZ_STATE_DIR}/metro/$(date +"%Y%m%d")_docker_size_kaz.log"

bin/optimiseCloud.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-KAZ_ROOT=$(cd "$(dirname $0)"/..; pwd)
-. $KAZ_ROOT/bin/.commonFunctions.sh
-setKazVars
-. $DOCKERS_ENV
-. $KAZ_ROOT/secret/SetAllPass.sh
-
-for cloud in $(docker ps | grep -i cloud |awk '{print $12}')
-do
-	echo -e "$RED$cloud "
-	echo -e "$GREEN execution de :occ db:add-missing-indices"
-	docker exec -ti -u 33 $cloud /var/www/html/occ db:add-missing-indices
-done

bin/scriptSauve.sh

@@ -26,7 +26,7 @@ SCRIPTLOG="/mnt/disk-nas1/log/${PRG}-$(date +%d-%m-%Y-%H-%M-%S).log"
 FICLOG="/var/log/${PRG}.log"
 ##################################################### 
 # - la liste des repertoires à sauver séparés par un espace
-LISTREPSAUV="/home /var/lib/docker/volumes"
+LISTREPSAUV="/var/lib/docker/volumes /kaz"
 ##################################################### 
 # - Les sauvegardes à garder jour, semaines, mois
 NB_BACKUPS_JOUR=15

bin/updateCloud.sh

@@ -68,7 +68,7 @@ addVarInConf "mail_smtpport" " 'mail_smtpport' => '25'," "'installed' => true,"
 addVarInConf "mail_sendmailmode" " 'mail_sendmailmode' => 'smtp'," "'installed' => true,"
 addVarInConf "mail_smtphost" " 'mail_smtphost' => 'smtp.kaz.bzh'," "'installed' => true,"
 addVarInConf "mail_smtpmode" " 'mail_smtpmode' => 'smtp'," "'installed' => true,"
-addVarInConf "enable_previews" " 'enable_previews' => false," "'installed' => true,"
+addVarInConf "enable_previews" " 'enable_previews' => true," "'installed' => true,"
 addVarInConf "trashbin_retention_obligation" " 'trashbin_retention_obligation' => '30, auto'," "'installed' => true,"
 #pour supprimer le message "obtenir un compte gratuit" dans le footer
 addVarInConf "simpleSignUpLink.shown" " 'simpleSignUpLink.shown' => false," "'installed' => true,"
@@ -78,7 +78,7 @@ if ! [[ "$(docker ps -f name=${DockerServName} | grep -w ${DockerServName})" ]];
     exit
 fi
 
-LIST_ALL=$(docker exec -u 33 "${DockerServName}" /var/www/html/occ app:list |
+LIST_ALL=$(docker exec -ti -u 33 "${DockerServName}" /var/www/html/occ app:list |
 	       awk 'BEGIN     {cp=0}
 		 /Enabled:/   {cp=1 ; next};
 		 /Disabled:/  {cp=0; next};
@@ -89,9 +89,12 @@ for app in tasks calendar bookmarks contacts mail richdocuments drawio rainloop
 do
     grep -wq "${app}" <<<"${LIST_ALL}" 2>/dev/null && continue
     echo "  install ${app}"
-    docker exec -u 33 "${DockerServName}" /var/www/html/occ app:install "${app}"
+    docker exec -ti -u 33 "${DockerServName}" /var/www/html/occ app:install "${app}"
 done
 
-docker exec -u 33 "${DockerServName}" /var/www/html/occ config:app:set --value "${OFFICE_URL}" richdocuments public_wopi_url
-docker exec -u 33 "${DockerServName}" /var/www/html/occ config:app:set --value "${OFFICE_URL}" richdocuments wopi_url
-docker exec -u 33 "${DockerServName}" /var/www/html/occ config:app:set --value "${OFFICE_URL}" richdocuments disable_certificate_verification
+docker exec -ti -u 33 "${DockerServName}" /var/www/html/occ config:app:set --value "${OFFICE_URL}" richdocuments public_wopi_url
+docker exec -ti -u 33 "${DockerServName}" /var/www/html/occ config:app:set --value "${OFFICE_URL}" richdocuments wopi_url
+docker exec -ti -u 33 "${DockerServName}" /var/www/html/occ config:app:set --value "${OFFICE_URL}" richdocuments disable_certificate_verification
+
+# A tester... Didier : normalement elle fonctionne, mais bon !
+docker exec -ti -u 33 "${DockerServName}" /var/www/html/occ config:system:set overwrite.cli.url --value=https\:\/\/${ORGA}-cloud.kaz.bzh