From 8382b812098f52a7b8e9504411a4b6ee1488c20d Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 15 May 2024 09:38:01 +0200 Subject: [PATCH 1/3] Update ocis_wopi docker-compose.yml --> add staging for letsencrypt Adding a command plus comments how to deal with the Letsencrypt staging environment. --- deployments/examples/ocis_wopi/docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 5f26e615c7..0cd17c4dca 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -18,6 +18,13 @@ services: - "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:-example@example.org}" - "--certificatesResolvers.http.acme.storage=/certs/acme.json" - "--certificatesResolvers.http.acme.httpChallenge.entryPoint=http" + + # Uncomment the command for testing when using real certificates: + # You will get an SSL error in the browser, but if you display the certificate and see it was emitted by + # "Fake LE Intermediate X1", it means all is good. It is the staging environment intermediate certificate used by Let's Encrypt. + # Re-comment to create real certificates. + #- "--certificatesresolvers.http.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + # enable dashboard - "--api.dashboard=true" # define entrypoints From bbfb36d12e03bf0ba29e9d7aee0ca69cbbc3c156 Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 15 May 2024 16:15:48 +0200 Subject: [PATCH 2/3] make caserver a configurable command --- deployments/examples/ocis_wopi/.env | 5 +++++ deployments/examples/ocis_wopi/docker-compose.yml | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/deployments/examples/ocis_wopi/.env b/deployments/examples/ocis_wopi/.env index d25cea9b68..e31b46102a 100644 --- a/deployments/examples/ocis_wopi/.env +++ b/deployments/examples/ocis_wopi/.env @@ -11,6 +11,11 @@ TRAEFIK_DOMAIN= TRAEFIK_BASIC_AUTH_USERS= # Email address for obtaining LetsEncrypt certificates, needs only be changed if this is a public facing server TRAEFIK_ACME_MAIL= +# Defaults to "https://acme-v02.api.letsencrypt.org/directory". +# Set to: "https://acme-staging-v02.api.letsencrypt.org/directory" for testing to check the certificate process. +# With staging, there will be an SSL error in the browser. When certificates are displayed and are emitted by +# "Fake LE Intermediate X1", the process went well and the envvar can be reset to empty to get valid certificates. +TRAEFIK_ACME_CASERVER= ### oCIS settings ### # oCIS version. Defaults to "latest" diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 0cd17c4dca..d19a4b5c6b 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -18,13 +18,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" - - # Uncomment the command for testing when using real certificates: - # You will get an SSL error in the browser, but if you display the certificate and see it was emitted by - # "Fake LE Intermediate X1", it means all is good. It is the staging environment intermediate certificate used by Let's Encrypt. - # Re-comment to create real certificates. - #- "--certificatesresolvers.http.acme.caserver=https://acme-staging-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 From 7e17aa372c4465f389db37a7994b5f5988da1a89 Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 15 May 2024 16:54:06 +0200 Subject: [PATCH 3/3] fixed the default of the wopi tag in the comment --- deployments/examples/ocis_wopi/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/examples/ocis_wopi/.env b/deployments/examples/ocis_wopi/.env index e31b46102a..fb791b35e1 100644 --- a/deployments/examples/ocis_wopi/.env +++ b/deployments/examples/ocis_wopi/.env @@ -31,7 +31,7 @@ DEMO_USERS= OCIS_LOG_LEVEL= ### Wopi server settings ### -# cs3org wopi server version. Defaults to "v8.3.3" +# cs3org wopi server version. Defaults to "v10.3.0" WOPISERVER_DOCKER_TAG= # cs3org wopi server domain. Defaults to "wopiserver.owncloud.test" WOPISERVER_DOMAIN=