From 2826bdf3bdedb3c2ce6d966a0057b8999ff34d7c Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 10 May 2021 08:54:08 +0200 Subject: [PATCH] switch to http internally --- deployments/examples/cs3_users_ocis/docker-compose.yml | 3 +-- deployments/examples/ocis_keycloak/docker-compose.yml | 3 +-- deployments/examples/ocis_traefik/docker-compose.yml | 3 +-- deployments/examples/ocis_wopi/docker-compose.yml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yml b/deployments/examples/cs3_users_ocis/docker-compose.yml index 79f6dac6dbc..1f1e21a6260 100644 --- a/deployments/examples/cs3_users_ocis/docker-compose.yml +++ b/deployments/examples/cs3_users_ocis/docker-compose.yml @@ -18,7 +18,6 @@ services: - "--entryPoints.https.address=:443" - "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.exposedByDefault=false" - - "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate ports: - "80:80" - "443:443" @@ -74,6 +73,7 @@ services: OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates + PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # change default secrets OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} volumes: @@ -91,7 +91,6 @@ services: - "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.services.ocis.loadbalancer.server.port=9200" - - "traefik.http.services.ocis.loadbalancer.server.scheme=https" logging: driver: "local" restart: always diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml index 18884472fef..59635a83555 100644 --- a/deployments/examples/ocis_keycloak/docker-compose.yml +++ b/deployments/examples/ocis_keycloak/docker-compose.yml @@ -19,7 +19,6 @@ services: - "--entryPoints.https.address=:443" - "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.exposedByDefault=false" - - "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate ports: - "80:80" - "443:443" @@ -63,6 +62,7 @@ services: OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates + PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # change default secrets IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp} STORAGE_LDAP_BIND_PASSWORD: ${STORAGE_LDAP_BIND_PASSWORD:-reva} @@ -82,7 +82,6 @@ services: - "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.services.ocis.loadbalancer.server.port=9200" - - "traefik.http.services.ocis.loadbalancer.server.scheme=https" logging: driver: "local" restart: always diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml index c86e73dfe39..43b03d25380 100644 --- a/deployments/examples/ocis_traefik/docker-compose.yml +++ b/deployments/examples/ocis_traefik/docker-compose.yml @@ -18,7 +18,6 @@ services: - "--entryPoints.https.address=:443" - "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.exposedByDefault=false" - - "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate ports: - "80:80" - "443:443" @@ -53,6 +52,7 @@ services: OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates + PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # change default secrets IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp} STORAGE_LDAP_BIND_PASSWORD: ${STORAGE_LDAP_BIND_PASSWORD:-reva} @@ -72,7 +72,6 @@ services: - "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.services.ocis.loadbalancer.server.port=9200" - - "traefik.http.services.ocis.loadbalancer.server.scheme=https" logging: driver: "local" restart: always diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 9d381ca30b9..af8e3e48785 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -20,7 +20,6 @@ services: - "--entryPoints.https.address=:443" - "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.exposedByDefault=false" - - "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate ports: - "80:80" - "443:443" @@ -56,6 +55,7 @@ services: OCIS_DOMAIN: ${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates + PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # change default secrets IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp} STORAGE_LDAP_BIND_PASSWORD: ${STORAGE_LDAP_BIND_PASSWORD:-reva} @@ -81,7 +81,6 @@ services: - "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.services.ocis.loadbalancer.server.port=9200" - - "traefik.http.services.ocis.loadbalancer.server.scheme=https" logging: driver: "local" restart: always