From b4d824b19980eadc410e9be30bdb03691400be5c Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Fri, 10 Apr 2020 23:38:43 +0200 Subject: [PATCH] Minor changes --- pydio-cells/docker-compose.yaml | 1 + traefik/docker-compose.yaml.host | 11 +++++++++-- traefik/docker-compose.yaml.net | 11 +++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pydio-cells/docker-compose.yaml b/pydio-cells/docker-compose.yaml index 32440cf..24ec6e4 100644 --- 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 7f0f0c7..c6d1bd2 100644 --- 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 a16cdbc..e11de7b 100644 --- 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: -- 2.47.3