use DOMAIN, DOMAIN_LOCAL consistently everywhere

services/bazarr.yml

@@ -9,7 +9,7 @@ services:
       public:
         ipv4_address: 192.168.240.31
     labels:
-      caddy: bazarr.home.arpa
+      caddy: bazarr..${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $BAZARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}

services/calibre-web-automated.yml

@@ -11,7 +11,7 @@ services:
     labels:
       # HTTP is needed for Kobo sync to work
       # 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 }}"
     environment:
       - PUID=${PUID}
@@ -34,6 +34,9 @@ services:
       UID: ${PUID}
       GID: ${PGID}
       CWA_DB_PATH: "/auth/app.db"
+    labels:
+      caddy: shelfmark.${DOMAIN_LOCAL}
+      caddy.reverse_proxy: "{{ upstreams 8084 }}"
     ports:
       - 8084:8084
     restart: unless-stopped

services/nextcloud.yml

@@ -1,7 +1,7 @@
 ---
 services:
   nextcloud:
-    image: registry.kucharczyk.xyz/nextcloud:latest
+    image: ${REGISTRY_URL}/nextcloud:latest
     container_name: nextcloud
     networks:
       public:

services/prowlarr.yml

@@ -5,7 +5,7 @@ services:
     image: linuxserver/prowlarr:2.0.5.5160-ls126
     container_name: prowlarr
     labels:
-      caddy: prowlarr.home.arpa
+      caddy: prowlarr.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams 9696 }}"
     networks:
       public:

services/radarr.yml

@@ -9,7 +9,7 @@ services:
       public:
         ipv4_address: 192.168.240.36
     labels:
-      caddy: radarr.home.arpa
+      caddy: radarr.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $RADARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}

services/sonarr.yml

@@ -9,7 +9,7 @@ services:
     ports:
       - "${SONARR_TV_STANDARD_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}"
     labels:
-      caddy: sonarr-tv.home.arpa
+      caddy: sonarr-tv.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}
@@ -31,7 +31,7 @@ services:
     ports:
       - "${SONARR_ANIME_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}"
     labels:
-      caddy: sonarr-anime.home.arpa
+      caddy: sonarr-anime.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}