From 6c21cbf6b205420d899258851c07633cd4e84b85 Mon Sep 17 00:00:00 2001 From: Hattshire Date: Mon, 20 Oct 2025 21:10:00 -0300 Subject: [PATCH] Use variables --- db.env | 2 +- docker-compose.yml | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/db.env b/db.env index 41106ca..62b6adb 100644 --- a/db.env +++ b/db.env @@ -1,3 +1,3 @@ -POSTGRES_PASSWORD= +POSTGRES_PASSWORD=${DB_PASSWORD:?Database Password Required} POSTGRES_DB=nextcloud POSTGRES_USER=nextcloud diff --git a/docker-compose.yml b/docker-compose.yml index 41f37e7..5141ca5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ volumes: - # NextCloud nc-data: db-data: @@ -20,9 +19,9 @@ services: target: /tmp:exec environment: - TRUSTED_PROXIES=172.16.0.0/12 192.168.0.0/16 10.0.0.0/8 fc00::/7 fe80::/10 2001:db8::/32 - - NEXTCLOUD_TRUSTED_DOMAINS=palta.cyou + - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN_NAME:?} - OVERWRITEPROTOCOL=https - - OVERWRITECLIURL=https://palta.cyou + - OVERWRITECLIURL=https://${DOMAIN_NAME} # - VIRTUAL_PROTO=fastcgi # - VIRTUAL_ROOT=xxx - POSTGRES_HOST=db @@ -58,8 +57,8 @@ services: build: ./images/ngx restart: always environment: - - VIRTUAL_HOST=palta.cyou - - LETSENCRYPT_HOST=palta.cyou + - VIRTUAL_HOST=${DOMAIN_NAME} + - LETSENCRYPT_HOST=${DOMAIN_NAME} volumes: - nc-data:/var/www/html:ro depends_on: @@ -90,14 +89,14 @@ services: image: collabora/code restart: always privileged: true - hostname: collabora.palta.cyou + hostname: ${COLLABORA_DOMAIN_NAME:-collabora.${DOMAIN_NAME}} environment: - - VIRTUAL_HOST=collabora.palta.cyou + - VIRTUAL_HOST=${COLLABORA_DOMAIN_NAME:-collabora.${DOMAIN_NAME}} - VIRTUAL_PORT=9980 - VIRTUAL_PROTO=https - - LETSENCRYPT_HOST=collabora.palta.cyou - - server_name=collabora.palta.cyou - - aliasgroup1=https://palta.cyou + - LETSENCRYPT_HOST=${COLLABORA_DOMAIN_NAME:-collabora.${DOMAIN_NAME}} + - server_name=${COLLABORA_DOMAIN_NAME:-collabora.${DOMAIN_NAME}} + - aliasgroup1=https://${DOMAIN_NAME} networks: - reverse_proxy-tier - nextcloud