diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env index d5913ca111..ec835d18c5 100644 --- a/deployments/examples/ocis_full/.env +++ b/deployments/examples/ocis_full/.env @@ -129,6 +129,11 @@ COLLABORA_ADMIN_USER= # Admin password for Collabora. # Defaults to "admin". COLLABORA_ADMIN_PASSWORD= +# Set to true to enable SSL for Collabora Online. Default is true if not specified. +COLLABORA_SSL_ENABLE=false +# If you're on an internet-facing server, enable SSL verification for Collabora Online. +# Please comment out the following line: +COLLABORA_SSL_VERIFICATION=false ### Supplemental Configurations ### # If you want to use supplemental configurations, diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml index e39a5adee2..b766fba059 100644 --- a/deployments/examples/ocis_full/collabora.yml +++ b/deployments/examples/ocis_full/collabora.yml @@ -55,7 +55,12 @@ services: environment: aliasgroup1: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}:443 DONT_GEN_SSL_CERT: "YES" - extra_params: --o:ssl.enable=false --o:ssl.termination=true --o:welcome.enable=false --o:net.frame_ancestors=${OCIS_DOMAIN:-ocis.owncloud.test} + extra_params: | + --o:ssl.enable=${COLLABORA_SSL_ENABLE:-true} \ + --o:ssl.ssl_verification=${COLLABORA_SSL_VERIFICATION:-true} \ + --o:ssl.termination=true \ + --o:welcome.enable=false \ + --o:net.frame_ancestors=${OCIS_DOMAIN:-ocis.owncloud.test} username: ${COLLABORA_ADMIN_USER:-admin} password: ${COLLABORA_ADMIN_PASSWORD:-admin} cap_add: diff --git a/deployments/examples/ocis_full/docker-compose.yml b/deployments/examples/ocis_full/docker-compose.yml index 264e9f3a31..15a2389fe8 100644 --- a/deployments/examples/ocis_full/docker-compose.yml +++ b/deployments/examples/ocis_full/docker-compose.yml @@ -11,7 +11,7 @@ services: - "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:-example@example.org}" - "--certificatesResolvers.http.acme.storage=/certs/acme.json" - "--certificatesResolvers.http.acme.httpChallenge.entryPoint=http" - - "--certificatesresolvers.http.acme.caserver=${TRAEFIK_ACME_CASERVER:-https://acme-v02.api.letsencrypt.org/directory}" + - "--certificatesResolvers.http.acme.caserver=${TRAEFIK_ACME_CASERVER:-https://acme-v02.api.letsencrypt.org/directory}" # enable dashboard - "--api.dashboard=true" # define entrypoints