Suppression des collabora des orga + foreign domains de castopod

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=(${pahekoHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost})
+availableComposes=(${pahekoHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost} ${castopodHost})
 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 [${pahekoHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost}] [friend-domain...] "
+    echo "       ${PRG} [-n] add orga [${pahekoHost} ${cloudHost} ${dokuwikiHost} ${wordpressHost} ${matterHost} ${castopodHost}] [friend-domain...] "
     echo "       ${PRG} [-n] del [friend-domain...]"
     echo "       ${PRG} -l"
     echo "  -l short list"

bin/manageCloud.sh

@@ -66,11 +66,10 @@ Init(){
     [ $? -ne 0 ] && echo "${CYAN}\n  $DockerServName est down : impossible de terminer l'install${NC}" && return 1 >& $QUIET
 
     CONF_FILE="${DOCK_VOL}/orga_${ORGA}-cloudConfig/_data/config.php"
-    OFFICE_URL="https://${ORGA}-${officeHost}.${domain}"
+    OFFICE_URL="https://${officeHost}.${domain}"
     CLOUD_URL="https://${ORGA}-${cloudHost}.${domain}"
     if [ -n "$CLOUDCOMMUN" ]; then 
         CONF_FILE="${DOCK_VOL}/cloud-cloudConfig/_data/config.php"
-        OFFICE_URL="https://${officeHost}.${domain}"
         CLOUD_URL="https://${cloudHost}.${domain}"
     elif [ -n "${ONNAS}" ]; then 
         CONF_FILE="${NAS_VOL}/orga_${ORGA}-cloudConfig/_data/config.php"

config/orgaTmpl/docker-compose.yml

@@ -67,41 +67,6 @@ services:
       - SMTP_PORT=25
       - MAIL_DOMAIN=${domain}
 #}}
-#{{collabora
-  collabora:
-    image: collabora/code
-    container_name: ${orga}${officeServName}
-    #disk_quota: 10G
-    restart: ${restartPolicy}
-    cap_add:
-      - MKNOD
-      - SYS_CHROOT
-      - FOWNER
-    # ports:
-    #   - 9980:9980
-    env_file:
-      - ../../secret/env-${officeServName}
-    environment:
-      - dictionaries=fr_FR en_GB es_ES
-      #- domain=.*${orga}${cloudHost}\.${domain}
-      - aliasgroup1=https://.*${orga}${cloudHost}\.${domain}:443
-      - server_name=${orga}${officeHost}.${domain}
-      - VIRTUAL_HOST=${orga}${officeHost}.${domain}
-      - VIRTUAL_PORT=9980
-      - VIRTUAL_PROTO=https
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${orga}${officeServName}.rule=Host(`${orga}${officeHost}.${domain}`)"
-      #- "traefik.http.routers.${orga}${officeServName}-admin.rule=Host(`${orga}${officeHost}.${domain}`) && PathPrefix(`/(c|l)ool/adminws`)"
-      #- "traefik.http.routers.${orga}${officeServName}-admin.middlewares=test-adminipwhitelist@file"
-      #- "traefik.http.routers.${orga}${officeServName}.rule=Host(`${orga}${officeHost}.${domain}`) && ! PathPrefix(`/(c|l)ool/adminws`)"
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /etc/timezone:/etc/timezone:ro
-    networks:
-      orgaNet:
-#}}
 #{{agora
   agora:
     build:
@@ -235,7 +200,7 @@ services:
       - ../../secret/env-${castopodDBName}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${orga}${castopodServName}.rule=Host(`${orga}${castopodHost}.${domain}`)"
+      - "traefik.http.routers.${orga}${castopodServName}.rule=Host(`${orga}${castopodHost}.${domain}`){{FOREIGN_POD}}"
   redis:
     image: redis:7.0-alpine
     container_name: ${orga}castopodCache

config/orgaTmpl/orga-gen.sh

@@ -355,6 +355,8 @@ update() {
 			 sed "s/\([^ ]*\) ${ORGA};/ \|\| Host(\`\1\`)/" | tr -d "\r\n")
 	FOREIGN_DW=$(grep " ${ORGA};" "${KAZ_CONF_PROXY_DIR}/wiki_kaz_map" 2>/dev/null | \
 			 sed "s/\([^ ]*\) ${ORGA};/ \|\| Host(\`\1\`)/" | tr -d "\r\n")
+	FOREIGN_POD=$(grep " ${ORGA};" "${KAZ_CONF_PROXY_DIR}/pod_kaz_map" 2>/dev/null | \
+			 sed "s/\([^ ]*\) ${ORGA};/ \|\| Host(\`\1\`)/" | tr -d "\r\n")
 	awk '
 	       	 BEGIN     {cp=1}
 		 /#}}/     {cp=1 ; next};
@@ -367,6 +369,7 @@ update() {
 					       -e "s/{{FOREIGN_WP}}/${FOREIGN_WP}/"\
 					       -e "s/{{FOREIGN_NC}}/${FOREIGN_NC}/"\
 					       -e "s/{{FOREIGN_DW}}/${FOREIGN_DW}/"\
+					       -e "s/{{FOREIGN_POD}}/${FOREIGN_POD}/"\
 					       -e "s|\${orga}|${ORGA}-|g"
     ) > "$2"
     sed "s/storage_opt:.*/storage_opt: ${quota}/g" -i "$2"

dockers/proxy/config/nginx.tmpl.conf

@@ -497,16 +497,16 @@ server {
     hostnames;
     include includes/wp_kaz_map;
   }
-  map $http_host $castopod_kaz_map {
+  map $http_host $pod_kaz_map {
     hostnames;
-    include includes/castopod_kaz_map;
+    include includes/pod_kaz_map;
   }
 
   server {
     server_name ~^(?<asso>.+)-__CASTOPOD_HOST__\.__DOMAIN__$;
-    include includes/castopod_kaz_name;
+    include includes/pod_kaz_name;
     if ($asso = '') {
-       set $asso $castopod_kaz_map;
+       set $asso $pod_kaz_map;
     }
     include includes/port;
     ssl_certificate /etc/letsencrypt/live/$ssl_local_cert/fullchain.pem;

dockers/proxy/proxy-gen.sh

@@ -13,7 +13,7 @@ DOCKER_DIST=docker-compose.tmpl.yml.dist
 DOCKER_TMPL=docker-compose.tmpl.yml
 DOCKER_CONF=docker-compose.yml
 
-for service in agora cloud paheko wiki wp castopod; do
+for service in agora cloud paheko wiki wp pod; do
     touch "${KAZ_CONF_PROXY_DIR}/${service}_kaz_map"
     touch "${KAZ_CONF_PROXY_DIR}/${service}_kaz_name"
 done