sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2039 from owncloud/switch_to_http_internally

Browse Source 
deployment examples: switch to http internally
This commit is contained in:
Alex Unger
2021-05-19 13:30:29 +02:00
committed by GitHub
parent 4e09c7f354 2826bdf3bd
commit 34a8ed3816
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployments/examples/cs3_users_ocis/docker-compose.yml
+1 -2
View File
@@ -18,7 +18,6 @@ services:
- "--entryPoints.https.address=:443" - "--entryPoints.https.address=:443"
- "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.endpoint=unix:///var/run/docker.sock"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -74,6 +73,7 @@ services:
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose 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_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 # change default secrets
OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
volumes: volumes:
@@ -91,7 +91,6 @@ services:
- "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
logging: logging:
driver: "local" driver: "local"
restart: always restart: always
deployments/examples/ocis_keycloak/docker-compose.yml
+1 -2
View File
@@ -19,7 +19,6 @@ services:
- "--entryPoints.https.address=:443" - "--entryPoints.https.address=:443"
- "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.endpoint=unix:///var/run/docker.sock"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -63,6 +62,7 @@ services:
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose 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_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 # change default secrets
IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp} IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp}
STORAGE_LDAP_BIND_PASSWORD: ${STORAGE_LDAP_BIND_PASSWORD:-reva} 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.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
logging: logging:
driver: "local" driver: "local"
restart: always restart: always
deployments/examples/ocis_traefik/docker-compose.yml
+1 -2
View File
@@ -18,7 +18,6 @@ services:
- "--entryPoints.https.address=:443" - "--entryPoints.https.address=:443"
- "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.endpoint=unix:///var/run/docker.sock"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -53,6 +52,7 @@ services:
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose 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_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 # change default secrets
IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp} IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp}
STORAGE_LDAP_BIND_PASSWORD: ${STORAGE_LDAP_BIND_PASSWORD:-reva} 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.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
logging: logging:
driver: "local" driver: "local"
restart: always restart: always
deployments/examples/ocis_wopi/docker-compose.yml
+1 -2
View File
@@ -20,7 +20,6 @@ services:
- "--entryPoints.https.address=:443" - "--entryPoints.https.address=:443"
- "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.endpoint=unix:///var/run/docker.sock"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -56,6 +55,7 @@ services:
OCIS_DOMAIN: ${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_DOMAIN: ${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose 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_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 # change default secrets
IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp} IDP_LDAP_BIND_PASSWORD: ${IDP_LDAP_BIND_PASSWORD:-idp}
STORAGE_LDAP_BIND_PASSWORD: ${STORAGE_LDAP_BIND_PASSWORD:-reva} 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.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
logging: logging:
driver: "local" driver: "local"
restart: always restart: always