diff --git a/group_vars/instance_system/vars.yaml b/group_vars/instance_system/vars.yaml index 5d82ab7..b58d9a2 100644 --- a/group_vars/instance_system/vars.yaml +++ b/group_vars/instance_system/vars.yaml @@ -1,5 +1,7 @@ --- timezone: Europe/Berlin +domain: pichi.berlin + stack_paperless_ocr_language: deu+eng stack_paperless_ocr_languages: eng deu frk diff --git a/roles/arr/defaults/main.yml b/roles/arr/defaults/main.yml index cdeb3e3..ff50345 100644 --- a/roles/arr/defaults/main.yml +++ b/roles/arr/defaults/main.yml @@ -1,6 +1,19 @@ --- # inherited from global +arrstack_sonarr_subdomain: "sonarr.{{ domain | default('example.org') }}" +arrstack_radarr_subdomain: "radarr.{{ domain | default('example.org') }}" +arrstack_lidarr_subdomain: "lidarr.{{ domain | default('example.org') }}" +arrstack_readarr_subdomain: "readarr.{{ domain | default('example.org') }}" +arrstack_prowlarr_subdomain: "prowlarr.{{ domain | default('example.org') }}" +arrstack_beets_subdomain: "beets.{{ domain | default('example.org') }}" +arrstack_sabnzbd_subdomain: "usenet.{{ domain | default('example.org') }}" +arrstack_qbit_subdomain: "torrent.{{ domain | default('example.org') }}" +arrstack_jellyseerr_subdomain: "get.{{ domain | default('example.org') }}" +arrstack_jellyfin_subdomain: "media.{{ domain | default('example.org') }}" +arrstack_audiobookshelf_subdomain: "books.{{ domain | default('example.org') }}" +arrstack_gonic_subdomain: "music.{{ domain | default('example.org') }}" +arrstack_homarr_subdomain: "{{ domain | default('example.org') }}" arrstack_tz: "{{ timezone | default('America/Chicago') }}" arrstack_puid: "{{ puid | default(1000) }}" arrstack_pgid: "{{ pgid | default(100) }}" diff --git a/roles/arr/templates/docker-compose.yaml.j2 b/roles/arr/templates/docker-compose.yaml.j2 index b4c91b1..76ab0a9 100644 --- a/roles/arr/templates/docker-compose.yaml.j2 +++ b/roles/arr/templates/docker-compose.yaml.j2 @@ -16,7 +16,7 @@ services: - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent" restart: unless-stopped labels: - caddy: "http://sonarr.pichi.berlin" + caddy: "{{ arrstack_sonarr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8989{{ '}}'}}" radarr: @@ -36,7 +36,7 @@ services: - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent" restart: unless-stopped labels: - caddy: "http://radarr.pichi.berlin" + caddy: "{{ arrstack_radarr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 7878{{ '}}'}}" lidarr: @@ -61,7 +61,7 @@ services: - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent" restart: unless-stopped labels: - caddy: "http://lidarr.pichi.berlin" + caddy: "{{ arrstack_lidarr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8686{{ '}}'}}" readarr: @@ -81,7 +81,7 @@ services: - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent" restart: unless-stopped labels: - caddy: "http://readarr.pichi.berlin" + caddy: "{{ arrstack_readarr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8787{{ '}}'}}" prowlarr: @@ -98,7 +98,7 @@ services: - "{{ arrstack_env_dir }}/config/prowlarr:/config" restart: unless-stopped labels: - caddy: "http://prowlarr.pichi.berlin" + caddy: "{{ arrstack_prowlarr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 9696{{ '}}'}}" beets: @@ -119,7 +119,7 @@ services: - "{{ arrstack_serve_dir }}/files/music-unsorted:/downloads" restart: unless-stopped labels: - caddy: "http://prowlarr.pichi.berlin" + caddy: "{{ arrstack_beets_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8337{{ '}}'}}" sabnzbd: @@ -137,7 +137,7 @@ services: - "{{ arrstack_serve_dir }}/files/usenet:/data/usenet:rw" restart: unless-stopped labels: - caddy: "http://usenet.pichi.berlin" + caddy: "{{ arrstack_sabnzbd_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8080{{ '}}'}}" vpn: @@ -172,7 +172,7 @@ services: # - 8000:8000 # gluetun http control restart: unless-stopped labels: - caddy: "http://torrent.pichi.berlin" + caddy: "{{ arrstack_qbit_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8888{{ '}}'}}" qbittorrent: image: linuxserver/qbittorrent @@ -241,7 +241,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock # Optional, only if you want docker integration restart: unless-stopped labels: - caddy: "http://pichi.berlin" + caddy: "{{ arrstack_homarr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 7575{{ '}}'}}" jellyseerr: @@ -258,7 +258,7 @@ services: - "{{ arrstack_env_dir }}/config/jellyseerr:/app/config" restart: unless-stopped labels: - caddy: "http://get.pichi.berlin" + caddy: "{{ arrstack_jellyseerr_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 5055{{ '}}'}}" audiobookshelf: @@ -278,7 +278,7 @@ services: # - "{{ arrstack_serve_dir }}/media/podcasts:/podcasts" # TODO: If integrating podcasts restart: unless-stopped labels: - caddy: "http://books.pichi.berlin" + caddy: "{{ arrstack_audiobookshelf_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 80{{ '}}'}}" jellyfin: @@ -306,7 +306,7 @@ services: - 1900:1900/udp #optional - dlna discovery restart: unless-stopped labels: - caddy: "http://media.pichi.berlin" + caddy: "{{ arrstack_jellyfin_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8096{{ '}}'}}" gonic: @@ -325,7 +325,7 @@ services: - "/srv/media/podcasts:/podcasts" #- /path/to/cache:/cache # transcode / covers / etc cache dir labels: - caddy: "http://music.pichi.berlin" + caddy: "{{ arrstack_gonic_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 80{{ '}}'}}" diff --git a/roles/grocy/defaults/main.yml b/roles/grocy/defaults/main.yml index ab2ad0b..3173b60 100644 --- a/roles/grocy/defaults/main.yml +++ b/roles/grocy/defaults/main.yml @@ -1,5 +1,6 @@ --- # inherited from global +stack_grocy_subdomain: "house.{{ domain | default('example.org') }}" stack_grocy_tz: "{{ timezone | default('America/Chicago') }}" stack_grocy_puid: "{{ puid | default(1000) }}" stack_grocy_pgid: "{{ pgid | default(100) }}" diff --git a/roles/grocy/templates/docker-compose.yaml.j2 b/roles/grocy/templates/docker-compose.yaml.j2 index 32d6b3a..d291d49 100644 --- a/roles/grocy/templates/docker-compose.yaml.j2 +++ b/roles/grocy/templates/docker-compose.yaml.j2 @@ -13,7 +13,7 @@ services: - "{{ arrstack_env_dir }}/config/grocy:/config" restart: unless-stopped labels: - caddy: "http://house.pichi.berlin" + caddy: "{{ stack_grocy_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 80{{ '}}'}}" networks: diff --git a/roles/paperless/defaults/main.yml b/roles/paperless/defaults/main.yml index 090333f..eb2289f 100644 --- a/roles/paperless/defaults/main.yml +++ b/roles/paperless/defaults/main.yml @@ -1,6 +1,7 @@ --- # inherited from global +stack_paperless_subdomain: "documents.{{ domain | default('example.org') }}" stack_paperless_tz: "{{ timezone | default('America/Chicago') }}" stack_paperless_puid: "{{ puid | default(1000) }}" stack_paperless_pgid: "{{ pgid | default(100) }}" diff --git a/roles/paperless/templates/docker-compose.yaml.j2 b/roles/paperless/templates/docker-compose.yaml.j2 index ed9682e..e2d739f 100644 --- a/roles/paperless/templates/docker-compose.yaml.j2 +++ b/roles/paperless/templates/docker-compose.yaml.j2 @@ -34,7 +34,7 @@ services: - "PAPERLESS_ADMIN_USER={{ stack_paperless_admin_user }}" - "PAPERLESS_ADMIN_PASSWORD={{ stack_paperless_admin_password }}" labels: - caddy: "http://documents.pichi.berlin" + caddy: "{{ stack_paperless_subdomain }}" caddy.reverse_proxy: "{{ '{{' }}upstreams 8000{{ '}}'}}" paperless-postgres: