maj docker-compose

dockers/collabora/docker-compose.yml

@@ -18,8 +18,8 @@ services:
       - dictionaries=fr_FR en_GB es_ES
       #- domain=${cloudHost}.${domain}
       - aliasgroup1=https://.*${cloudHost}.${domain}:443
-      - server_name=${officeHost}.${domain}
-      - VIRTUAL_HOST=${officeHost}.${domain}
+      - server_name=${site}-${officeHost}.${domain}
+      - VIRTUAL_HOST=${site}-${officeHost}.${domain}
       - VIRTUAL_PORT=9980
       - VIRTUAL_PROTO=https
       - extra_params=--o:ssl.enable=false --o:ssl.termination=true
@@ -27,12 +27,12 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
     networks:
-      collaboraNet:      
+      collaboraNet:
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${officeServName}-admin.rule=Host(`${officeHost}.${domain}`) && PathPrefix(`/(c|l)ool/adminws`)"
+      - "traefik.http.routers.${officeServName}-admin.rule=Host(`${site}-${officeHost}.${domain}`) && PathPrefix(`/(c|l)ool/adminws`)"
       - "traefik.http.routers.${officeServName}-admin.middlewares=test-adminipwhitelist@file"
-      - "traefik.http.routers.${officeServName}.rule=Host(`${officeHost}.${domain}`) && ! PathPrefix(`/(c|l)ool/adminws`)"
+      - "traefik.http.routers.${officeServName}.rule=Host(`${site}-${officeHost}.${domain}`) && ! PathPrefix(`/(c|l)ool/adminws`)"
 
 networks:
   collaboraNet: