Minor changes

diff --git a/pydio-cells/docker-compose.yaml b/pydio-cells/docker-compose.yaml
index 32440cf8b43748d0e444d599e8bdba0bd193bc9a..24ec6e45d53523b4c57749af416a739f3f05aefd 100644 (file)
--- a/pydio-cells/docker-compose.yaml
+++ b/pydio-cells/docker-compose.yaml
@@ -14,6 +14,7 @@ services:
       - CELLS_NO_TLS=1
     volumes:
       - ${DOCKER_CFG_DIR}/pydio-cells:/var/cells
+    #network_mode: host
     networks:
       - proxy
     labels:

diff --git a/traefik/docker-compose.yaml.host b/traefik/docker-compose.yaml.host
index 7f0f0c7ed790c2fc1ff50708d417f15686c98260..c6d1bd22b4c8e5e159d8167a9061c2f76e07e6ca 100644 (file)
--- a/traefik/docker-compose.yaml.host
+++ b/traefik/docker-compose.yaml.host
@@ -33,15 +33,22 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.entrypoints=http"
       - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
+      #- "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`) ||
+      #                                    (Host(`docker.giorgioravera.it`) && (PathPrefix(`/traefik`) || PathPrefix(`/api`)))"
       - "traefik.http.routers.traefik.service=api@internal"
       - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik.middlewares=traefik-auth,traefik-stripprefix"
       #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
       - "traefik.http.routers.traefik-secure.entrypoints=https"
       - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
+      #- "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`) ||
+      #                                           (Host(`docker.giorgioravera.it`) && (PathPrefix(`/traefik`) || PathPrefix(`/api`)))"
       - "traefik.http.routers.traefik-secure.tls=true"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
-      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
       #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
+      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik-secure.middlewares=traefik-auth,traefik-stripprefix"
+      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
+      - "traefik.http.middlewares.traefik-stripprefix.stripprefix.prefixes=/traefik"
       - "traefik.http.services.workaround.loadbalancer.server.port=9999"

diff --git a/traefik/docker-compose.yaml.net b/traefik/docker-compose.yaml.net
index a16cdbcf5a9b1d7e739df52123ea7db183a7b8ec..e11de7bd9446c4d463ff3eefb9b4f894df73ce7c 100644 (file)
--- a/traefik/docker-compose.yaml.net
+++ b/traefik/docker-compose.yaml.net
@@ -35,17 +35,24 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.entrypoints=http"
       - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
+      #- "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`) ||
+      #                                    (Host(`docker.giorgioravera.it`) && (PathPrefix(`/traefik`) || PathPrefix(`/api`)))"
       - "traefik.http.routers.traefik.service=api@internal"
       - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik.middlewares=traefik-auth,traefik-stripprefix"
       #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
-      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.traefik-secure.entrypoints=https"
       - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`) ||
+      #                                           (Host(`docker.giorgioravera.it`) && (PathPrefix(`/traefik`) || PathPrefix(`/api`)))"
       - "traefik.http.routers.traefik-secure.tls=true"
       #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
+      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik-secure.middlewares=traefik-auth,traefik-stripprefix"
+      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
+      - "traefik.http.middlewares.traefik-stripprefix.stripprefix.prefixes=/traefik"
 
 networks:
   proxy: