Merge branch 'traefik-v2' into 'master'

Migrate to Traefik v2

See merge request picasoft/projets/dockerfiles!53

pica-nextcloud/cet/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.7'
 networks:
   nextcloud_cet:
     name: nextcloud_cet
-  docker_default:
+  proxy:
     external: true
 
 volumes:
@@ -34,11 +34,17 @@ services:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     env_file: ./secrets/cloudcet.secrets
     labels:
-      - "traefik.frontend.rule=Host:cloudcet.picasoft.net"
-      - "traefik.port=80"
-      - "traefik.enable=true"
+      traefik.http.routers.cloudcet.entrypoints: websecure
+      traefik.http.routers.cloudcet.rule: Host(`cloudcet.picasoft.net`)
+      traefik.http.services.cloudcet.loadbalancer.server.port: 80
+      traefik.enable: true
+      # https://docs.nextcloud.com/server/16/admin_manual/configuration_server/reverse_proxy_configuration.html
+      traefik.http.routers.cloudcet.middlewares: cloudcet@docker
+      traefik.http.middlewares.cloudcet.redirectregex.permanent: true
+      traefik.http.middlewares.cloudcet.redirectregex.regex: ^/.well-known/(card|cal)dav
+      traefik.http.middlewares.cloudcet.redirectregex.replacement: /remote.php/dav/
     networks:
-      - docker_default
+      - proxy
       - nextcloud_cet
     depends_on:
       - cloudcet

pica-nextcloud/pica/docker-compose.yml

@@ -8,8 +8,8 @@ volumes:
 
 networks:
   nextcloud:
-  docker_default:
-    name: docker_default
+  proxy:
+    external: true
 
 services:
   nextcloud-app:
@@ -38,15 +38,17 @@ services:
       - nextcloud-app
     networks:
       - nextcloud
-      - docker_default
+      - proxy
     labels:
-      - "traefik.frontend.rule=Host:cloud.picasoft.net"
-      - "traefik.port=80"
-      - "traefik.enable=true"
+      traefik.http.routers.nextcloud-web.entrypoints: websecure
+      traefik.http.routers.nextcloud-web.rule: Host(`cloud.picasoft.net`)
+      traefik.http.services.nextcloud-web.loadbalancer.server.port: 80
+      traefik.enable: true
       # https://docs.nextcloud.com/server/16/admin_manual/configuration_server/reverse_proxy_configuration.html
-      - "traefik.frontend.redirect.permanent=true"
-      - "traefik.frontend.redirect.regex=https://(.*)/.well-known/(card|cal)dav"
-      - "traefik.frontend.redirect.replacement=https://$$1/remote.php/dav/"
+      traefik.http.routers.nextcloud-web.middlewares: nextcloud-web@docker
+      traefik.http.middlewares.nextcloud-web.redirectregex.permanent: true
+      traefik.http.middlewares.nextcloud-web.redirectregex.regex: ^/.well-known/(card|cal)dav
+      traefik.http.middlewares.nextcloud-web.redirectregex.replacement: /remote.php/dav/
     restart: unless-stopped
 
   nextcloud-db: