From 2eab9d35d3432439a042ebd106d9c99133d582ec Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 17 Jul 2025 17:48:31 +0200 Subject: [PATCH] roles: Add inherited protocol for subdomains Can be set globally ('protocol: http://') or per stack. Defaults to empty which caddy treats as https. --- roles/arr/defaults/main.yml | 27 ++++++++++++++------------- roles/grocy/defaults/main.yml | 3 ++- roles/paperless/defaults/main.yml | 3 ++- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/roles/arr/defaults/main.yml b/roles/arr/defaults/main.yml index 56f6f35..e4a00e5 100644 --- a/roles/arr/defaults/main.yml +++ b/roles/arr/defaults/main.yml @@ -1,19 +1,20 @@ --- # 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_protocol: "{{ protocol | default('')}}" +arrstack_sonarr_subdomain: "{{ arrstack_protocol }}sonarr.{{ domain | default('example.org') }}" +arrstack_radarr_subdomain: "{{ arrstack_protocol }}radarr.{{ domain | default('example.org') }}" +arrstack_lidarr_subdomain: "{{ arrstack_protocol }}lidarr.{{ domain | default('example.org') }}" +arrstack_readarr_subdomain: "{{ arrstack_protocol }}readarr.{{ domain | default('example.org') }}" +arrstack_prowlarr_subdomain: "{{ arrstack_protocol }}prowlarr.{{ domain | default('example.org') }}" +arrstack_beets_subdomain: "{{ arrstack_protocol }}beets.{{ domain | default('example.org') }}" +arrstack_sabnzbd_subdomain: "{{ arrstack_protocol }}usenet.{{ domain | default('example.org') }}" +arrstack_qbit_subdomain: "{{ arrstack_protocol }}torrent.{{ domain | default('example.org') }}" +arrstack_jellyseerr_subdomain: "{{ arrstack_protocol }}get.{{ domain | default('example.org') }}" +arrstack_jellyfin_subdomain: "{{ arrstack_protocol }}media.{{ domain | default('example.org') }}" +arrstack_audiobookshelf_subdomain: "{{ arrstack_protocol }}books.{{ domain | default('example.org') }}" +arrstack_gonic_subdomain: "{{ arrstack_protocol }}music.{{ domain | default('example.org') }}" +arrstack_homarr_subdomain: "{{ arrstack_protocol }}{{ domain | default('example.org') }}" arrstack_tz: "{{ timezone | default('America/Chicago') }}" arrstack_puid: "{{ puid | default(1000) }}" arrstack_pgid: "{{ pgid | default(100) }}" diff --git a/roles/grocy/defaults/main.yml b/roles/grocy/defaults/main.yml index f4229e2..64ecba9 100644 --- a/roles/grocy/defaults/main.yml +++ b/roles/grocy/defaults/main.yml @@ -1,6 +1,7 @@ --- # inherited from global -stack_grocy_subdomain: "house.{{ domain | default('example.org') }}" +stack_grocy_protocol: "{{ protocol | default('')}}" +stack_grocy_subdomain: "{{ stack_grocy_protocol }}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/paperless/defaults/main.yml b/roles/paperless/defaults/main.yml index eb2289f..70860bc 100644 --- a/roles/paperless/defaults/main.yml +++ b/roles/paperless/defaults/main.yml @@ -1,7 +1,8 @@ --- # inherited from global -stack_paperless_subdomain: "documents.{{ domain | default('example.org') }}" +stack_paperless_protocol: "{{ protocol | default('')}}" +stack_paperless_subdomain: "{{ stack_paperless_protocol }}documents.{{ domain | default('example.org') }}" stack_paperless_tz: "{{ timezone | default('America/Chicago') }}" stack_paperless_puid: "{{ puid | default(1000) }}" stack_paperless_pgid: "{{ pgid | default(100) }}"