1
0

use DOMAIN, DOMAIN_LOCAL consistently everywhere

This commit is contained in:
2026-04-19 17:09:52 +02:00
parent abc735d71c
commit 7cb5094e0e
7 changed files with 30 additions and 18 deletions
+20 -11
View File
@@ -40,7 +40,7 @@ configs:
file_server file_server
} }
} }
mimi.kucharczyk.xyz { mimi.${DOMAIN} {
handle { handle {
root * /etc/caddy/sites-enabled root * /etc/caddy/sites-enabled
file_server { file_server {
@@ -48,13 +48,13 @@ configs:
} }
} }
} }
files.kucharczyk.xyz { files.${DOMAIN_LOCAL} {
reverse_proxy 192.168.0.106:3923 reverse_proxy 192.168.0.106:3923
} }
photos.kucharczyk.xyz { photos.${DOMAIN} {
reverse_proxy 192.168.0.167:2283 reverse_proxy 192.168.0.167:2283
} }
http://ca.home.arpa { http://ca.${DOMAIN_LOCAL} {
root * /data/caddy/pki/authorities/local/ root * /data/caddy/pki/authorities/local/
file_server browse file_server browse
} }
@@ -219,6 +219,9 @@ services:
- "${DOCKER_STORAGE_PATH}/audiobookshelf/metadata:/metadata" - "${DOCKER_STORAGE_PATH}/audiobookshelf/metadata:/metadata"
ports: ports:
- "${AUDIOBOOKSHELF_EXTERNAL_PORT}:${AUDIOBOOKSHELF_INTERNAL_PORT}" - "${AUDIOBOOKSHELF_EXTERNAL_PORT}:${AUDIOBOOKSHELF_INTERNAL_PORT}"
labels:
caddy: audiobooks.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams 80 }}"
networks: networks:
public: public:
ipv4_address: 192.168.240.6 ipv4_address: 192.168.240.6
@@ -276,7 +279,7 @@ services:
webhook: webhook:
image: ${REGISTRY_URL}/webhook image: ${REGISTRY_URL}/webhook
container_name: webhook container_name: webhook
build: https://git.kucharczyk.xyz/containers/webhook.git#main build: https://git.${DOMAIN}/containers/webhook.git#main
user: ${PUID}:${PGID} user: ${PUID}:${PGID}
environment: environment:
- TZ=${TZ} - TZ=${TZ}
@@ -400,6 +403,9 @@ services:
- tika - tika
ports: ports:
- "${PAPERLESS_EXTERNAL_PORT}:${PAPERLESS_INTERNAL_PORT}" - "${PAPERLESS_EXTERNAL_PORT}:${PAPERLESS_INTERNAL_PORT}"
labels:
caddy: paperless.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $PAPERLESS_INTERNAL_PORT }}"
networks: networks:
public: public:
ipv4_address: 192.168.240.16 ipv4_address: 192.168.240.16
@@ -456,7 +462,7 @@ services:
ports: ports:
- "${HOMER_EXTERNAL_PORT}:${HOMER_INTERNAL_PORT}" - "${HOMER_EXTERNAL_PORT}:${HOMER_INTERNAL_PORT}"
labels: labels:
caddy: dashboard.home.arpa caddy: dashboard.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $HOMER_INTERNAL_PORT }}" caddy.reverse_proxy: "{{ upstreams $HOMER_INTERNAL_PORT }}"
networks: networks:
public: public:
@@ -516,7 +522,7 @@ services:
ports: ports:
- "${PHOTOPRISM_EXTERNAL_PORT}:${PHOTOPRISM_INTERNAL_PORT}" - "${PHOTOPRISM_EXTERNAL_PORT}:${PHOTOPRISM_INTERNAL_PORT}"
labels: labels:
caddy: photoprism.home.arpa caddy: photoprism.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams 2342 }}" caddy.reverse_proxy: "{{ upstreams 2342 }}"
depends_on: depends_on:
- mariadb - mariadb
@@ -681,7 +687,7 @@ services:
- 6881:6881 - 6881:6881
- 6881:6881/udp - 6881:6881/udp
labels: labels:
caddy: qbt.home.arpa caddy: qbt.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $QBITTORRENT_WEBUI_INTERNAL_PORT }}" caddy.reverse_proxy: "{{ upstreams $QBITTORRENT_WEBUI_INTERNAL_PORT }}"
restart: unless-stopped restart: unless-stopped
@@ -696,10 +702,10 @@ services:
ports: ports:
- 8005:8000 - 8005:8000
labels: labels:
caddy: bwiki.${DOMAIN} bwiki.home.arpa caddy: bwiki.${DOMAIN}, bwiki.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams 8000 }}" caddy.reverse_proxy: "{{ upstreams 8000 }}"
environment: environment:
- bw_canonical_origin=bwiki.kucharczyk.xyz - bw_canonical_origin=bwiki.${DOMAIN}
- bw_feature_search_suggestions=true - bw_feature_search_suggestions=true
- bw_port=8000 - bw_port=8000
@@ -733,7 +739,7 @@ services:
BROWSER_WEB_URL: http://chrome:9222 BROWSER_WEB_URL: http://chrome:9222
NEXTAUTH_SECRET: lB5mx3t9mdKclELtt+cs2pVBefB+8vD4dKuzhvUP+JzR9bL1 NEXTAUTH_SECRET: lB5mx3t9mdKclELtt+cs2pVBefB+8vD4dKuzhvUP+JzR9bL1
MEILI_MASTER_KEY: Cvu7m/RIGYQPiYcIrxacHFhbfLKfKq3wwSAWJPKVWQEauiIX MEILI_MASTER_KEY: Cvu7m/RIGYQPiYcIrxacHFhbfLKfKq3wwSAWJPKVWQEauiIX
NEXTAUTH_URL: https://karakeep.kucharczykx.xyz NEXTAUTH_URL: https://karakeep.${DOMAIN}
DISABLE_SIGNUPS: TRUE DISABLE_SIGNUPS: TRUE
CRAWLER_VIDEO_DOWNLOAD: TRUE CRAWLER_VIDEO_DOWNLOAD: TRUE
BROWSER_COOKIE_PATH: /data/yt-cookies.json BROWSER_COOKIE_PATH: /data/yt-cookies.json
@@ -928,6 +934,9 @@ services:
- "5030:5030" - "5030:5030"
# - "5031:5031" # - "5031:5031"
- "50300:50300" - "50300:50300"
labels:
caddy: slskd.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams 5030 }}"
env_file: env_file:
- secrets/slskd_secrets.env - secrets/slskd_secrets.env
environment: environment:
+1 -1
View File
@@ -9,7 +9,7 @@ services:
public: public:
ipv4_address: 192.168.240.31 ipv4_address: 192.168.240.31
labels: labels:
caddy: bazarr.home.arpa caddy: bazarr..${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $BAZARR_INTERNAL_PORT }}" caddy.reverse_proxy: "{{ upstreams $BAZARR_INTERNAL_PORT }}"
environment: environment:
- PUID=${PUID} - PUID=${PUID}
+4 -1
View File
@@ -11,7 +11,7 @@ services:
labels: labels:
# HTTP is needed for Kobo sync to work # HTTP is needed for Kobo sync to work
# otherwise downloading books to device fails # otherwise downloading books to device fails
caddy: "cwa.${DOMAIN}, http://cwa.${DOMAIN}" caddy: "cwa.${DOMAIN}, http://cwa.${DOMAIN}, http://books.${DOMAIN_LOCAL}, books.${DOMAIN_LOCAL}"
caddy.reverse_proxy: "{{ upstreams 8083 }}" caddy.reverse_proxy: "{{ upstreams 8083 }}"
environment: environment:
- PUID=${PUID} - PUID=${PUID}
@@ -34,6 +34,9 @@ services:
UID: ${PUID} UID: ${PUID}
GID: ${PGID} GID: ${PGID}
CWA_DB_PATH: "/auth/app.db" CWA_DB_PATH: "/auth/app.db"
labels:
caddy: shelfmark.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams 8084 }}"
ports: ports:
- 8084:8084 - 8084:8084
restart: unless-stopped restart: unless-stopped
+1 -1
View File
@@ -1,7 +1,7 @@
--- ---
services: services:
nextcloud: nextcloud:
image: registry.kucharczyk.xyz/nextcloud:latest image: ${REGISTRY_URL}/nextcloud:latest
container_name: nextcloud container_name: nextcloud
networks: networks:
public: public:
+1 -1
View File
@@ -5,7 +5,7 @@ services:
image: linuxserver/prowlarr:2.0.5.5160-ls126 image: linuxserver/prowlarr:2.0.5.5160-ls126
container_name: prowlarr container_name: prowlarr
labels: labels:
caddy: prowlarr.home.arpa caddy: prowlarr.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams 9696 }}" caddy.reverse_proxy: "{{ upstreams 9696 }}"
networks: networks:
public: public:
+1 -1
View File
@@ -9,7 +9,7 @@ services:
public: public:
ipv4_address: 192.168.240.36 ipv4_address: 192.168.240.36
labels: labels:
caddy: radarr.home.arpa caddy: radarr.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $RADARR_INTERNAL_PORT }}" caddy.reverse_proxy: "{{ upstreams $RADARR_INTERNAL_PORT }}"
environment: environment:
- PUID=${PUID} - PUID=${PUID}
+2 -2
View File
@@ -9,7 +9,7 @@ services:
ports: ports:
- "${SONARR_TV_STANDARD_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}" - "${SONARR_TV_STANDARD_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}"
labels: labels:
caddy: sonarr-tv.home.arpa caddy: sonarr-tv.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}" caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}"
environment: environment:
- PUID=${PUID} - PUID=${PUID}
@@ -31,7 +31,7 @@ services:
ports: ports:
- "${SONARR_ANIME_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}" - "${SONARR_ANIME_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}"
labels: labels:
caddy: sonarr-anime.home.arpa caddy: sonarr-anime.${DOMAIN_LOCAL}
caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}" caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}"
environment: environment:
- PUID=${PUID} - PUID=${PUID}