Browse Source

wellknown urls dans la config traefik/NC

develop-etcd
Fanch 11 months ago
parent
commit
d95e40d8c4
  1. 14
      config/orgaTmpl/docker-compose.yml
  2. 5
      dockers/traefik/conf/dynamic/conf.yml

14
config/orgaTmpl/docker-compose.yml

@ -40,13 +40,7 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.${orga}${nextcloudServName}.rule=Host(`${orga}${cloudHost}.${domain}`){{FOREIGN_NC}}"
- "traefik.http.routers.${orga}${nextcloudServName}.middlewares=nextcloud-redirectregex1,nextcloud-redirectregex2"
- "traefik.http.middlewares.nextcloud-redirectregex1.redirectregex.permanent=true"
- "traefik.http.middlewares.nextcloud-redirectregex1.redirectregex.regex=https?://([^/]*)/.well-known/(card|cal)dav"
- "traefik.http.middlewares.nextcloud-redirectregex1.redirectregex.replacement=https://$${1}/remote.php/dav/"
- "traefik.http.middlewares.nextcloud-redirectregex2.redirectregex.permanent=true"
- "traefik.http.middlewares.nextcloud-redirectregex2.redirectregex.regex=https?://([^/]*)(/.well-known[^#]*)"
- "traefik.http.middlewares.nextcloud-redirectregex2.redirectregex.replacement=https://$${1}/index.php$${2}"
- "traefik.http.routers.${orga}${nextcloudServName}.middlewares=nextcloud-redirectregex1@file,nextcloud-redirectregex2@file"
volumes:
- cloudMain:/var/www/html
- cloudData:/var/www/html/data
@ -127,7 +121,7 @@ services:
- matterPlugins:/mattermost/plugins:rw
- matterClientPlugins:/mattermost/client/plugins:rw
- matterIcons:/mattermost/client/images:ro
- /etc/ssl:/etc/ssl:ro
- /etc/ssl:/etc/ssl:ro
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- /etc/environment:/etc/environment:ro
@ -173,7 +167,7 @@ services:
image: mprasil/dokuwiki
container_name: ${orga}${dokuwikiServName}
#disk_quota: 10G
restart: ${restartPolicy}
restart: ${restartPolicy}
labels:
- "traefik.enable=true"
- "traefik.http.routers.${orga}${dokuwikiServName}.rule=Host(`${orga}${dokuwikiHost}.${domain}`){{FOREIGN_DW}}"
@ -184,7 +178,7 @@ services:
- wikiLibtpl:/dokuwiki/lib/tpl
- wikiLogs:/var/log
networks:
- orgaNet
- orgaNet
# - postfixNet
external_links:
- ${smtpServName}:${smtpHost}.${domain}

5
dockers/traefik/conf/dynamic/conf.yml

@ -9,10 +9,9 @@ http:
redirectregex:
permanent: true
regex: https?://([^/]*)/.well-known/(card|cal)dav
replacement: https://$${1}/remote.php/dav/
replacement: https://${1}/remote.php/dav/
nextcloud-redirectregex2:
redirectregex:
permanent: true
regex: https?://([^/]*)(/.well-known[^#]*)
replacement: https://$${1}/index.php$${2}
replacement: https://${1}/index.php${2}

Loading…
Cancel
Save