From bb67aacbfebed3b89d0dd346aa5311f5147a1c99 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 31 May 2022 09:51:17 +0200 Subject: [PATCH] remove temporary GRAPH_LDAP_INSECURE workaround after fix in https://github.com/owncloud/ocis/pull/3888 --- deployments/examples/oc10_ocis_parallel/docker-compose.yml | 1 - deployments/examples/ocis_hello/docker-compose.yml | 1 - deployments/examples/ocis_ldap/docker-compose.yml | 1 - deployments/examples/ocis_s3/docker-compose.yml | 1 - deployments/examples/ocis_traefik/docker-compose.yml | 1 - deployments/examples/ocis_wopi/docker-compose.yml | 1 - 6 files changed, 6 deletions(-) diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index 47a92d7ed5e..a4de089c4ed 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -126,7 +126,6 @@ services: PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" volumes: diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml index f2f16c573fd..ea494d32465 100644 --- a/deployments/examples/ocis_hello/docker-compose.yml +++ b/deployments/examples/ocis_hello/docker-compose.yml @@ -60,7 +60,6 @@ services: SETTINGS_GRPC_ADDR: 0.0.0.0:9191 # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index 0c22e3453e2..15ef5b484e3 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -80,7 +80,6 @@ services: PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password diff --git a/deployments/examples/ocis_s3/docker-compose.yml b/deployments/examples/ocis_s3/docker-compose.yml index 8e58d833635..ed5b0ec3d5c 100644 --- a/deployments/examples/ocis_s3/docker-compose.yml +++ b/deployments/examples/ocis_s3/docker-compose.yml @@ -67,7 +67,6 @@ services: STORAGE_USERS_S3NG_BUCKET: ${MINIO_BUCKET:-ocis-bucket} # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml index a6d47e9a86b..b32a90f7bd6 100644 --- a/deployments/examples/ocis_traefik/docker-compose.yml +++ b/deployments/examples/ocis_traefik/docker-compose.yml @@ -58,7 +58,6 @@ services: PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index b078a431f25..f89038035d9 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -62,7 +62,6 @@ services: GATEWAY_GRPC_ADDR: 0.0.0.0:9142 # make the REVA gateway accessible to the app drivers # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password