Merge pull request #10750 from owncloud/revert-10746-ocis_full_proper…

…_label_naming Revert "[docs-only][chore] Improve readbility of traefik labels"
owncloud · Dec 9, 2024 · ee65fc8 · ee65fc8
2 parents 49bc296 + 65f057e
commit ee65fc8
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml
@@ -43,17 +43,17 @@ services:
       - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.collaboration.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.collaboration.entrypoints=https"
       - "traefik.http.routers.collaboration.rule=Host(`${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}`)"
-      - "traefik.http.routers.collaboration.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.collaboration.tls.certresolver=http"
       - "traefik.http.routers.collaboration.service=collaboration"
       - "traefik.http.services.collaboration.loadbalancer.server.port=9300"
     logging:
       driver: ${LOG_DRIVER:-local}
     restart: always
 
   collabora:
-    image: collabora/code:24.04.10.2.1
+    image: collabora/code:24.04.10.1.1
     # release notes: https://www.collaboraonline.com/release-notes/
     networks:
       ocis-net:
@@ -72,9 +72,9 @@ services:
       - MKNOD
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.collabora.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.collabora.entrypoints=https"
       - "traefik.http.routers.collabora.rule=Host(`${COLLABORA_DOMAIN:-collabora.owncloud.test}`)"
-      - "traefik.http.routers.collabora.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.collabora.tls.certresolver=http"
       - "traefik.http.routers.collabora.service=collabora"
       - "traefik.http.services.collabora.loadbalancer.server.port=9980"
     logging:

diff --git a/deployments/examples/ocis_full/docker-compose.yml b/deployments/examples/ocis_full/docker-compose.yml
@@ -8,22 +8,22 @@ services:
     command:
       - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}"
       # letsencrypt configuration
-      - "--certificatesResolvers.letsencrypt_http.acme.email=${TRAEFIK_ACME_MAIL:[email protected]}"
-      - "--certificatesResolvers.letsencrypt_http.acme.storage=/certs/acme.json"
-      - "--certificatesResolvers.letsencrypt_http.acme.httpChallenge.entryPoint=letsencrypt_http"
-      - "--certificatesResolvers.letsencrypt_http.acme.caserver=${TRAEFIK_ACME_CASERVER:-https://acme-v02.api.letsencrypt.org/directory}"
+      - "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:[email protected]}"
+      - "--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}"
       # enable dashboard
       - "--api.dashboard=true"
       # define entrypoints
-      - "--entryPoints.letsencrypt_http.address=:80"
-      - "--entryPoints.letsencrypt_http.http.redirections.entryPoint.to=letsencrypt_https"
-      - "--entryPoints.letsencrypt_http.http.redirections.entryPoint.scheme=https"
-      - "--entryPoints.letsencrypt_https.address=:443"
+      - "--entryPoints.http.address=:80"
+      - "--entryPoints.http.http.redirections.entryPoint.to=https"
+      - "--entryPoints.http.http.redirections.entryPoint.scheme=https"
+      - "--entryPoints.https.address=:443"
       # change default timeouts for long-running requests
       # this is needed for webdav clients that do not support the TUS protocol
-      - "--entryPoints.letsencrypt_https.transport.respondingTimeouts.readTimeout=12h"
-      - "--entryPoints.letsencrypt_https.transport.respondingTimeouts.writeTimeout=12h"
-      - "--entryPoints.letsencrypt_https.transport.respondingTimeouts.idleTimeout=3m"
+      - "--entryPoints.https.transport.respondingTimeouts.readTimeout=12h"
+      - "--entryPoints.https.transport.respondingTimeouts.writeTimeout=12h"
+      - "--entryPoints.https.transport.respondingTimeouts.idleTimeout=3m"
       # docker provider (get configuration from container labels)
       - "--providers.docker.endpoint=unix:///var/run/docker.sock"
       - "--providers.docker.exposedByDefault=false"
@@ -41,10 +41,10 @@ services:
       - "traefik.enable=${TRAEFIK_DASHBOARD:-false}"
        # defaults to admin:admin
       - "traefik.http.middlewares.traefik-auth.basicauth.users=${TRAEFIK_BASIC_AUTH_USERS:-admin:$$apr1$$4vqie50r$$YQAmQdtmz5n9rEALhxJ4l.}"
-      - "traefik.http.routers.traefik.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.traefik.entrypoints=https"
       - "traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:-traefik.owncloud.test}`)"
       - "traefik.http.routers.traefik.middlewares=traefik-auth"
-      - "traefik.http.routers.traefik.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.traefik.tls.certresolver=http"
       - "traefik.http.routers.traefik.service=api@internal"
     logging:
       driver: ${LOG_DRIVER:-local}

diff --git a/deployments/examples/ocis_full/inbucket.yml b/deployments/examples/ocis_full/inbucket.yml
@@ -24,9 +24,9 @@ services:
       INBUCKET_STORAGE_MAILBOXMSGCAP: 1000
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.inbucket.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.inbucket.entrypoints=https"
       - "traefik.http.routers.inbucket.rule=Host(`${INBUCKET_DOMAIN:-mail.owncloud.test}`)"
-      - "traefik.http.routers.inbucket.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.inbucket.tls.certresolver=http"
       - "traefik.http.routers.inbucket.service=inbucket"
       - "traefik.http.services.inbucket.loadbalancer.server.port=9000"
     logging:

diff --git a/deployments/examples/ocis_full/minio.yml b/deployments/examples/ocis_full/minio.yml
@@ -19,9 +19,9 @@ services:
       MINIO_SECRET_KEY: ${S3NG_SECRET_KEY:-ocis-secret-key}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.minio.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.minio.entrypoints=https"
       - "traefik.http.routers.minio.rule=Host(`${MINIO_DOMAIN:-minio.owncloud.test}`)"
-      - "traefik.http.routers.minio.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.minio.tls.certresolver=http"
       - "traefik.http.routers.minio.service=minio"
       - "traefik.http.services.minio.loadbalancer.server.port=9001"
     logging:

diff --git a/deployments/examples/ocis_full/ocis.yml b/deployments/examples/ocis_full/ocis.yml
@@ -62,9 +62,9 @@ services:
       - ${OCIS_DATA_DIR:-ocis-data}:/var/lib/ocis
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.ocis.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.ocis.entrypoints=https"
       - "traefik.http.routers.ocis.rule=Host(`${OCIS_DOMAIN:-ocis.owncloud.test}`)"
-      - "traefik.http.routers.ocis.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.ocis.tls.certresolver=http"
       - "traefik.http.routers.ocis.service=ocis"
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
     logging:

diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml
@@ -39,9 +39,9 @@ services:
       - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.collaboration-oo.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.collaboration-oo.entrypoints=https"
       - "traefik.http.routers.collaboration-oo.rule=Host(`${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.owncloud.test}`)"
-      - "traefik.http.routers.collaboration-oo.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.collaboration-oo.tls.certresolver=http"
       - "traefik.http.routers.collaboration-oo.service=collaboration-oo"
       - "traefik.http.services.collaboration-oo.loadbalancer.server.port=9300"
     logging:
@@ -71,9 +71,9 @@ services:
       # https://helpcenter.onlyoffice.com/installation/docs-enterprise-install-docker.aspx
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.onlyoffice.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.onlyoffice.entrypoints=https"
       - "traefik.http.routers.onlyoffice.rule=Host(`${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test}`)"
-      - "traefik.http.routers.onlyoffice.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.onlyoffice.tls.certresolver=http"
       - "traefik.http.routers.onlyoffice.service=onlyoffice"
       - "traefik.http.services.onlyoffice.loadbalancer.server.port=80"
       # websockets can't be opened when this is omitted

diff --git a/deployments/examples/ocis_full/web_extensions/importer.yml b/deployments/examples/ocis_full/web_extensions/importer.yml
@@ -39,9 +39,9 @@ services:
       - companion-data:/tmp/companion/
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.companion.entrypoints=letsencrypt_https"
+      - "traefik.http.routers.companion.entrypoints=https"
       - "traefik.http.routers.companion.rule=Host(`${COMPANION_DOMAIN:-companion.owncloud.test}`)"
-      - "traefik.http.routers.companion.tls.certresolver=letsencrypt_http"
+      - "traefik.http.routers.companion.tls.certresolver=http"
       - "traefik.http.routers.companion.service=companion"
       - "traefik.http.services.companion.loadbalancer.server.port=3020"
     logging: