From 78e7b1a46f9a277761228451f012a81d5df8e911 Mon Sep 17 00:00:00 2001 From: Bryan Joshua Pedini Date: Fri, 17 Jul 2026 22:22:20 +0200 Subject: [PATCH] removed traefik http, renamed variables --- docker-compose.yml | 33 ++++++++++++++------------------- example.env | 12 ++++++------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0347af7..e5af090 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,15 @@ --- services: nextcloud: - image: nextcloud:${NC_VERSION} + image: nextcloud:${NEXTCLOUD_VERSION} restart: unless-stopped depends_on: - mariadb environment: - MYSQL_HOST=mariadb - - MYSQL_DATABASE=${NC_DATABASE_NAME} - - MYSQL_USER=${NC_DATABASE_USER} - - MYSQL_PASSWORD=${NC_DATABASE_PASS} + - MYSQL_DATABASE=${NEXTCLOUD_DATABASE_NAME} + - MYSQL_USER=${NEXTCLOUD_DATABASE_USER} + - MYSQL_PASSWORD=${NEXTCLOUD_DATABASE_PASS} - OVERWRITEPROTOCOL=https - PHP_MEMORY_LIMIT=1024M - PHP_UPLOAD_LIMIT=1024M @@ -17,19 +17,14 @@ services: - traefik.enable=${TRAEFIK_ENABLED} - traefik.docker.network=${TRAEFIK_NETWORK} # specify a custom middleware for nextcloud-specific configuration - - traefik.http.middlewares.nextcloud-redirectregex.redirectRegex.permanent=true - - traefik.http.middlewares.nextcloud-redirectregex.redirectRegex.regex="https://(.*)/.well-known/(card|cal)dav" - - traefik.http.middlewares.nextcloud-redirectregex.redirectRegex.replacement="https://$${1}/remote.php/dav/" - ### Section HTTP - - traefik.http.routers.http-${TRAEFIK_ROUTER}.entrypoints=http - # redirect to HTTPS only - - traefik.http.routers.http-${TRAEFIK_ROUTER}.middlewares=http-to-https - - traefik.http.routers.http-${TRAEFIK_ROUTER}.rule=Host(`${TRAEFIK_MATCHRULE}`) - ### Section HTTPS + - traefik.http.middlewares.${TRAEFIK_ROUTER}-redirectregex.redirectRegex.permanent=true + - traefik.http.middlewares.${TRAEFIK_ROUTER}-redirectregex.redirectRegex.regex="https://(.*)/.well-known/(card|cal)dav" + - traefik.http.middlewares.${TRAEFIK_ROUTER}-redirectregex.redirectRegex.replacement="https://$${1}/remote.php/dav/" + # HTTPS - traefik.http.routers.https-${TRAEFIK_ROUTER}.entrypoints=https # configure the exposed service - traefik.http.routers.https-${TRAEFIK_ROUTER}.middlewares=hsts,nextcloud-redirectregex - - traefik.http.routers.https-${TRAEFIK_ROUTER}.rule=Host(`${TRAEFIK_MATCHRULE}`) + - traefik.http.routers.https-${TRAEFIK_ROUTER}.rule=${TRAEFIK_MATCHRULE} # of course, enable TLS and it's certificate provider - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls=${TRAEFIK_TLSENABLED} - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls.certresolver=${TRAEFIK_CERTRESOLVER} @@ -42,13 +37,13 @@ services: - ./data/nextcloud:/var/www/html mariadb: - image: mariadb:${DB_VERSION} + image: mariadb:${MARIADB_VERSION} restart: unless-stopped environment: - - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASS} - - MYSQL_DATABASE=${NC_DATABASE_NAME} - - MYSQL_USER=${NC_DATABASE_USER} - - MYSQL_PASSWORD=${NC_DATABASE_PASS} + - MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASS} + - MYSQL_DATABASE=${NEXTCLOUD_DATABASE_NAME} + - MYSQL_USER=${NEXTCLOUD_DATABASE_USER} + - MYSQL_PASSWORD=${NEXTCLOUD_DATABASE_PASS} healthcheck: test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] start_period: 30s diff --git a/example.env b/example.env index 126d0f7..c41dc35 100644 --- a/example.env +++ b/example.env @@ -1,12 +1,12 @@ # NextCloud environment -NC_VERSION=22.2.6-apache -NC_DATABASE_NAME=nextcloud -NC_DATABASE_USER=nextcloud -NC_DATABASE_PASS=changeme +NEXTCLOUD_VERSION=22.2.6-apache +NEXTCLOUD_DATABASE_NAME=nextcloud +NEXTCLOUD_DATABASE_USER=nextcloud +NEXTCLOUD_DATABASE_PASS=changeme # MariaDB environment -DB_VERSION=10.7.3 -DB_ROOT_PASS=Sup3rS3cr3tPassw0rd! +MARIADB_VERSION=10.7.3 +MARIADB_ROOT_PASS=Sup3rS3cr3tPassw0rd! # Træfik environment TRAEFIK_ENABLED=true