diff --git a/roles/authelia/defaults/main.yml b/roles/authelia/defaults/main.yml index 8884452368..2c8ef8fb1d 100644 --- a/roles/authelia/defaults/main.yml +++ b/roles/authelia/defaults/main.yml @@ -153,9 +153,9 @@ authelia_paths_folders_list: authelia_web_subdomain: "{{ authelia.subdomain }}" authelia_web_domain: "{{ user.domain }}" authelia_web_port: "9091" -authelia_web_url: "{{ 'https://' + authelia_web_subdomain + '.' + authelia_web_domain +authelia_web_url: "{{ 'https://' + (authelia_web_subdomain + '.' + authelia_web_domain if (authelia_web_subdomain | length > 0) - else authelia_web_domain }}" + else authelia_web_domain) }}" ################################ # DNS diff --git a/roles/autobrr/defaults/main.yml b/roles/autobrr/defaults/main.yml index 9ffdbfc789..b3e0ba0ef9 100644 --- a/roles/autobrr/defaults/main.yml +++ b/roles/autobrr/defaults/main.yml @@ -30,9 +30,9 @@ autobrr_paths_folders_list: autobrr_web_subdomain: "{{ autobrr_name }}" autobrr_web_domain: "{{ user.domain }}" autobrr_web_port: "7474" -autobrr_web_url: "{{ 'https://' + autobrr_web_subdomain + '.' + autobrr_web_domain +autobrr_web_url: "{{ 'https://' + (autobrr_web_subdomain + '.' + autobrr_web_domain if (autobrr_web_subdomain | length > 0) - else autobrr_web_domain }}" + else autobrr_web_domain) }}" ################################ # DNS diff --git a/roles/autoscan/defaults/main.yml b/roles/autoscan/defaults/main.yml index 595d64fe87..820d3c891e 100644 --- a/roles/autoscan/defaults/main.yml +++ b/roles/autoscan/defaults/main.yml @@ -30,9 +30,9 @@ autoscan_paths_config_location: "{{ autoscan_paths_location }}/config.yml" autoscan_web_subdomain: "{{ autoscan_name }}" autoscan_web_domain: "{{ user.domain }}" autoscan_web_port: "3030" -autoscan_web_url: "{{ 'https://' + lookup('vars', autoscan_name + '_web_subdomain', default=autoscan_web_subdomain) + '.' + lookup('vars', autoscan_name + '_web_domain', default=autoscan_web_domain) +autoscan_web_url: "{{ 'https://' + (lookup('vars', autoscan_name + '_web_subdomain', default=autoscan_web_subdomain) + '.' + lookup('vars', autoscan_name + '_web_domain', default=autoscan_web_domain) if (lookup('vars', autoscan_name + '_web_subdomain', default=autoscan_web_subdomain) | length > 0) - else lookup('vars', autoscan_name + '_web_domain', default=autoscan_web_domain) }}" + else lookup('vars', autoscan_name + '_web_domain', default=autoscan_web_domain)) }}" ################################ # DNS diff --git a/roles/bazarr/defaults/main.yml b/roles/bazarr/defaults/main.yml index 419576a290..d641732d15 100644 --- a/roles/bazarr/defaults/main.yml +++ b/roles/bazarr/defaults/main.yml @@ -29,9 +29,9 @@ bazarr_paths_folders_list: bazarr_web_subdomain: "{{ bazarr_name }}" bazarr_web_domain: "{{ user.domain }}" bazarr_web_port: "6767" -bazarr_web_url: "{{ 'https://' + lookup('vars', bazarr_name + '_web_subdomain', default=bazarr_web_subdomain) + '.' + lookup('vars', bazarr_name + '_web_domain', default=bazarr_web_domain) +bazarr_web_url: "{{ 'https://' + (lookup('vars', bazarr_name + '_web_subdomain', default=bazarr_web_subdomain) + '.' + lookup('vars', bazarr_name + '_web_domain', default=bazarr_web_domain) if (lookup('vars', bazarr_name + '_web_subdomain', default=bazarr_web_subdomain) | length > 0) - else lookup('vars', bazarr_name + '_web_domain', default=bazarr_web_domain) }}" + else lookup('vars', bazarr_name + '_web_domain', default=bazarr_web_domain)) }}" ################################ # DNS diff --git a/roles/deluge/defaults/main.yml b/roles/deluge/defaults/main.yml index 3a1186bbd0..254af04485 100644 --- a/roles/deluge/defaults/main.yml +++ b/roles/deluge/defaults/main.yml @@ -36,9 +36,9 @@ deluge_paths_folders_list: deluge_web_subdomain: "{{ deluge_name }}" deluge_web_domain: "{{ user.domain }}" deluge_web_port: "8112" -deluge_web_url: "{{ 'https://' + deluge_web_subdomain + '.' + deluge_web_domain +deluge_web_url: "{{ 'https://' + (deluge_web_subdomain + '.' + deluge_web_domain if (deluge_web_subdomain | length > 0) - else deluge_web_domain }}" + else deluge_web_domain) }}" ################################ # DNS diff --git a/roles/dozzle/defaults/main.yml b/roles/dozzle/defaults/main.yml index 67cca731df..ee29df6015 100644 --- a/roles/dozzle/defaults/main.yml +++ b/roles/dozzle/defaults/main.yml @@ -29,9 +29,9 @@ dozzle_paths_folders_list: dozzle_web_subdomain: "{{ dozzle_name }}" dozzle_web_domain: "{{ user.domain }}" dozzle_web_port: "8080" -dozzle_web_url: "{{ 'https://' + dozzle_web_subdomain + '.' + dozzle_web_domain +dozzle_web_url: "{{ 'https://' + (dozzle_web_subdomain + '.' + dozzle_web_domain if (dozzle_web_subdomain | length > 0) - else dozzle_web_domain }}" + else dozzle_web_domain) }}" ################################ # DNS diff --git a/roles/emby/defaults/main.yml b/roles/emby/defaults/main.yml index 53f7777c08..319193d2fa 100644 --- a/roles/emby/defaults/main.yml +++ b/roles/emby/defaults/main.yml @@ -35,9 +35,9 @@ emby_paths_dlna_xml_location: "{{ emby_paths_location }}/config/dlna.xml" emby_web_subdomain: "{{ emby_name }}" emby_web_domain: "{{ user.domain }}" emby_web_port: "8096" -emby_web_url: "{{ 'https://' + lookup('vars', emby_name + '_web_subdomain', default=emby_web_subdomain) + '.' + lookup('vars', emby_name + '_web_domain', default=emby_web_domain) +emby_web_url: "{{ 'https://' + (lookup('vars', emby_name + '_web_subdomain', default=emby_web_subdomain) + '.' + lookup('vars', emby_name + '_web_domain', default=emby_web_domain) if (lookup('vars', emby_name + '_web_subdomain', default=emby_web_subdomain) | length > 0) - else lookup('vars', emby_name + '_web_domain', default=emby_web_domain) }}" + else lookup('vars', emby_name + '_web_domain', default=emby_web_domain)) }}" ################################ # DNS diff --git a/roles/grafana/defaults/main.yml b/roles/grafana/defaults/main.yml index 509611d248..21b7356c4e 100644 --- a/roles/grafana/defaults/main.yml +++ b/roles/grafana/defaults/main.yml @@ -28,9 +28,9 @@ grafana_paths_folders_list: grafana_web_subdomain: "{{ grafana_name }}" grafana_web_domain: "{{ user.domain }}" grafana_web_port: "3000" -grafana_web_url: "{{ 'https://' + grafana_web_subdomain + '.' + grafana_web_domain +grafana_web_url: "{{ 'https://' + (grafana_web_subdomain + '.' + grafana_web_domain if (grafana_web_subdomain | length > 0) - else grafana_web_domain }}" + else grafana_web_domain) }}" ################################ # DNS diff --git a/roles/jackett/defaults/main.yml b/roles/jackett/defaults/main.yml index 6c6a2b823a..ff784aa80c 100644 --- a/roles/jackett/defaults/main.yml +++ b/roles/jackett/defaults/main.yml @@ -29,9 +29,9 @@ jackett_paths_folders_list: jackett_web_subdomain: "{{ jackett_name }}" jackett_web_domain: "{{ user.domain }}" jackett_web_port: "9117" -jackett_web_url: "{{ 'https://' + jackett_web_subdomain + '.' + jackett_web_domain +jackett_web_url: "{{ 'https://' + (jackett_web_subdomain + '.' + jackett_web_domain if (jackett_web_subdomain | length > 0) - else jackett_web_domain }}" + else jackett_web_domain) }}" ################################ # DNS diff --git a/roles/jaeger/defaults/main.yml b/roles/jaeger/defaults/main.yml index 19a0d4db3b..07c29a1e53 100644 --- a/roles/jaeger/defaults/main.yml +++ b/roles/jaeger/defaults/main.yml @@ -29,9 +29,9 @@ jaeger_paths_folders_list: jaeger_web_subdomain: "{{ traefik.subdomains.jaeger }}" jaeger_web_domain: "{{ user.domain }}" jaeger_web_port: "16686" -jaeger_web_url: "{{ 'https://' + jaeger_web_subdomain + '.' + jaeger_web_domain +jaeger_web_url: "{{ 'https://' + (jaeger_web_subdomain + '.' + jaeger_web_domain if (jaeger_web_subdomain | length > 0) - else jaeger_web_domain }}" + else jaeger_web_domain) }}" ################################ # DNS diff --git a/roles/jellyfin/defaults/main.yml b/roles/jellyfin/defaults/main.yml index 7a18c58884..18f766affc 100644 --- a/roles/jellyfin/defaults/main.yml +++ b/roles/jellyfin/defaults/main.yml @@ -38,9 +38,9 @@ jellyfin_paths_xml_loct_old: "{{ jellyfin_paths_location }}/app/config/system.xm jellyfin_web_subdomain: "{{ jellyfin_name }}" jellyfin_web_domain: "{{ user.domain }}" jellyfin_web_port: "8096" -jellyfin_web_url: "{{ 'https://' + lookup('vars', jellyfin_name + '_web_subdomain', default=jellyfin_web_subdomain) + '.' + lookup('vars', jellyfin_name + '_web_domain', default=jellyfin_web_domain) +jellyfin_web_url: "{{ 'https://' + (lookup('vars', jellyfin_name + '_web_subdomain', default=jellyfin_web_subdomain) + '.' + lookup('vars', jellyfin_name + '_web_domain', default=jellyfin_web_domain) if (lookup('vars', jellyfin_name + '_web_subdomain', default=jellyfin_web_subdomain) | length > 0) - else lookup('vars', jellyfin_name + '_web_domain', default=jellyfin_web_domain) }}" + else lookup('vars', jellyfin_name + '_web_domain', default=jellyfin_web_domain)) }}" ################################ # DNS diff --git a/roles/lidarr/defaults/main.yml b/roles/lidarr/defaults/main.yml index 2363c33aed..727e6eeb89 100644 --- a/roles/lidarr/defaults/main.yml +++ b/roles/lidarr/defaults/main.yml @@ -36,9 +36,9 @@ lidarr_paths_config_location: "{{ lidarr_paths_location }}/config.xml" lidarr_web_subdomain: "{{ lidarr_name }}" lidarr_web_domain: "{{ user.domain }}" lidarr_web_port: "8686" -lidarr_web_url: "{{ 'https://' + lookup('vars', lidarr_name + '_web_subdomain', default=lidarr_web_subdomain) + '.' + lookup('vars', lidarr_name + '_web_domain', default=lidarr_web_domain) +lidarr_web_url: "{{ 'https://' + (lookup('vars', lidarr_name + '_web_subdomain', default=lidarr_web_subdomain) + '.' + lookup('vars', lidarr_name + '_web_domain', default=lidarr_web_domain) if (lookup('vars', lidarr_name + '_web_subdomain', default=lidarr_web_subdomain) | length > 0) - else lookup('vars', lidarr_name + '_web_domain', default=lidarr_web_domain) }}" + else lookup('vars', lidarr_name + '_web_domain', default=lidarr_web_domain)) }}" ################################ # DNS diff --git a/roles/lldap/defaults/main.yml b/roles/lldap/defaults/main.yml index 356959a6ef..8c5ef57b30 100644 --- a/roles/lldap/defaults/main.yml +++ b/roles/lldap/defaults/main.yml @@ -51,9 +51,9 @@ lldap_paths_folders_list: lldap_web_subdomain: "lldap" lldap_web_domain: "{{ user.domain }}" lldap_web_port: "17170" -lldap_web_url: "{{ 'https://' + lldap_web_subdomain + '.' + lldap_web_domain +lldap_web_url: "{{ 'https://' + (lldap_web_subdomain + '.' + lldap_web_domain if (lldap_web_subdomain | length > 0) - else lldap_web_domain }}" + else lldap_web_domain) }}" ################################ # DNS diff --git a/roles/netdata/defaults/main.yml b/roles/netdata/defaults/main.yml index 091cab0d4c..56050095c9 100644 --- a/roles/netdata/defaults/main.yml +++ b/roles/netdata/defaults/main.yml @@ -47,9 +47,9 @@ netdata_paths_folders_list: netdata_web_subdomain: "{{ netdata_name }}" netdata_web_domain: "{{ user.domain }}" netdata_web_port: "19999" -netdata_web_url: "{{ 'https://' + netdata_web_subdomain + '.' + netdata_web_domain +netdata_web_url: "{{ 'https://' + (netdata_web_subdomain + '.' + netdata_web_domain if (netdata_web_subdomain | length > 0) - else netdata_web_domain }}" + else netdata_web_domain) }}" ################################ # DNS diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index eb9f51b176..29d4c895e2 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -29,9 +29,9 @@ nginx_paths_folders_list: nginx_web_subdomain: "{{ nginx_name }}" nginx_web_domain: "{{ user.domain }}" nginx_web_port: "80" -nginx_web_url: "{{ 'https://' + lookup('vars', nginx_name + '_web_subdomain', default=nginx_web_subdomain) + '.' + lookup('vars', nginx_name + '_web_domain', default=nginx_web_domain) +nginx_web_url: "{{ 'https://' + (lookup('vars', nginx_name + '_web_subdomain', default=nginx_web_subdomain) + '.' + lookup('vars', nginx_name + '_web_domain', default=nginx_web_domain) if (lookup('vars', nginx_name + '_web_subdomain', default=nginx_web_subdomain) | length > 0) - else lookup('vars', nginx_name + '_web_domain', default=nginx_web_domain) }}" + else lookup('vars', nginx_name + '_web_domain', default=nginx_web_domain)) }}" ################################ # DNS diff --git a/roles/nzbhydra2/defaults/main.yml b/roles/nzbhydra2/defaults/main.yml index 20df703c40..0732db5702 100644 --- a/roles/nzbhydra2/defaults/main.yml +++ b/roles/nzbhydra2/defaults/main.yml @@ -31,9 +31,9 @@ nzbhydra2_paths_config_location: "{{ nzbhydra2_paths_location }}/nzbhydra.yml" nzbhydra2_web_subdomain: "{{ nzbhydra2_name }}" nzbhydra2_web_domain: "{{ user.domain }}" nzbhydra2_web_port: "5076" -nzbhydra2_web_url: "{{ 'https://' + nzbhydra2_web_subdomain + '.' + nzbhydra2_web_domain +nzbhydra2_web_url: "{{ 'https://' + (nzbhydra2_web_subdomain + '.' + nzbhydra2_web_domain if (nzbhydra2_web_subdomain | length > 0) - else nzbhydra2_web_domain }}" + else nzbhydra2_web_domain) }}" ################################ # DNS diff --git a/roles/organizr/defaults/main.yml b/roles/organizr/defaults/main.yml index 7a14c35dec..d496d3fdf5 100644 --- a/roles/organizr/defaults/main.yml +++ b/roles/organizr/defaults/main.yml @@ -29,9 +29,9 @@ organizr_paths_folders_list: organizr_web_subdomain: "organizr" organizr_web_domain: "{{ user.domain }}" organizr_web_port: "80" -organizr_web_url: "{{ 'https://' + organizr_web_subdomain + '.' + organizr_web_domain +organizr_web_url: "{{ 'https://' + (organizr_web_subdomain + '.' + organizr_web_domain if (organizr_web_subdomain | length > 0) - else organizr_web_domain }}" + else organizr_web_domain) }}" ################################ # DNS diff --git a/roles/overseerr/defaults/main.yml b/roles/overseerr/defaults/main.yml index 0f8b82b3a9..94158d78a2 100644 --- a/roles/overseerr/defaults/main.yml +++ b/roles/overseerr/defaults/main.yml @@ -31,9 +31,9 @@ overseerr_paths_folders_list: overseerr_web_subdomain: "{{ overseerr_name }}" overseerr_web_domain: "{{ user.domain }}" overseerr_web_port: "5055" -overseerr_web_url: "{{ 'https://' + lookup('vars', overseerr_name + '_web_subdomain', default=overseerr_web_subdomain) + '.' + lookup('vars', overseerr_name + '_web_domain', default=overseerr_web_domain) +overseerr_web_url: "{{ 'https://' + (lookup('vars', overseerr_name + '_web_subdomain', default=overseerr_web_subdomain) + '.' + lookup('vars', overseerr_name + '_web_domain', default=overseerr_web_domain) if (lookup('vars', overseerr_name + '_web_subdomain', default=overseerr_web_subdomain) | length > 0) - else lookup('vars', overseerr_name + '_web_domain', default=overseerr_web_domain) }}" + else lookup('vars', overseerr_name + '_web_domain', default=overseerr_web_domain)) }}" ################################ # DNS diff --git a/roles/petio/defaults/main.yml b/roles/petio/defaults/main.yml index 6a550326e6..0d4ff288ff 100644 --- a/roles/petio/defaults/main.yml +++ b/roles/petio/defaults/main.yml @@ -35,9 +35,9 @@ petio_paths_folders_list: petio_web_subdomain: "{{ petio_name }}" petio_web_domain: "{{ user.domain }}" petio_web_port: "7777" -petio_web_url: "{{ 'https://' + petio_web_subdomain + '.' + petio_web_domain +petio_web_url: "{{ 'https://' + (petio_web_subdomain + '.' + petio_web_domain if (petio_web_subdomain | length > 0) - else petio_web_domain }}" + else petio_web_domain) }}" ################################ # DNS diff --git a/roles/plex/defaults/main.yml b/roles/plex/defaults/main.yml index f83b1678e0..1ea333bccf 100644 --- a/roles/plex/defaults/main.yml +++ b/roles/plex/defaults/main.yml @@ -59,17 +59,17 @@ plex_web_port: "32400" plex_web_scheme: "https" plex_web_http_port: "32400" plex_web_http_scheme: "http" -plex_web_url: "{{ 'https://' + lookup('vars', plex_name + '_web_subdomain', default=plex_web_subdomain) + '.' + lookup('vars', plex_name + '_web_domain', default=plex_web_domain) +plex_web_url: "{{ 'https://' + (lookup('vars', plex_name + '_web_subdomain', default=plex_web_subdomain) + '.' + lookup('vars', plex_name + '_web_domain', default=plex_web_domain) if (lookup('vars', plex_name + '_web_subdomain', default=plex_web_subdomain) | length > 0) - else lookup('vars', plex_name + '_web_domain', default=plex_web_domain) }}" + else lookup('vars', plex_name + '_web_domain', default=plex_web_domain)) }}" plex_webtools_web_subdomain: "{{ plex_name }}-webtools" plex_webtools_web_domain: "{{ plex_web_domain }}" plex_webtools_web_port: "33400" plex_webtools_host: "{{ lookup('vars', plex_name + '_webtools_web_subdomain', default=plex_webtools_web_subdomain) + '.' + lookup('vars', plex_name + '_webtools_web_domain', default=plex_webtools_web_domain) }}" -plex_web_insecure_url: "{{ 'http://' + lookup('vars', plex_name + '_web_subdomain', default=plex_web_subdomain) + '.' + lookup('vars', plex_name + '_web_domain', default=plex_web_domain) +plex_web_insecure_url: "{{ 'http://' + (lookup('vars', plex_name + '_web_subdomain', default=plex_web_subdomain) + '.' + lookup('vars', plex_name + '_web_domain', default=plex_web_domain) if (lookup('vars', plex_name + '_web_subdomain', default=plex_web_subdomain) | length > 0) - else lookup('vars', plex_name + '_web_domain', default=plex_web_domain) }}" + else lookup('vars', plex_name + '_web_domain', default=plex_web_domain)) }}" ################################ # DNS diff --git a/roles/portainer/defaults/main.yml b/roles/portainer/defaults/main.yml index 0a3b28373a..bbfc5378cc 100644 --- a/roles/portainer/defaults/main.yml +++ b/roles/portainer/defaults/main.yml @@ -29,9 +29,9 @@ portainer_paths_folders_list: portainer_web_subdomain: "{{ portainer_name }}" portainer_web_domain: "{{ user.domain }}" portainer_web_port: "9000" -portainer_web_url: "{{ 'https://' + portainer_web_subdomain + '.' + portainer_web_domain +portainer_web_url: "{{ 'https://' + (portainer_web_subdomain + '.' + portainer_web_domain if (portainer_web_subdomain | length > 0) - else portainer_web_domain }}" + else portainer_web_domain) }}" ################################ # DNS diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index ea263f15e3..23f2046351 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -39,9 +39,9 @@ prometheus_paths_folders_list: prometheus_web_subdomain: "{{ prometheus_name }}" prometheus_web_domain: "{{ user.domain }}" prometheus_web_port: "9090" -prometheus_web_url: "{{ 'https://' + prometheus_web_subdomain + '.' + prometheus_web_domain +prometheus_web_url: "{{ 'https://' + (prometheus_web_subdomain + '.' + prometheus_web_domain if (prometheus_web_subdomain | length > 0) - else prometheus_web_domain }}" + else prometheus_web_domain) }}" ################################ # DNS diff --git a/roles/prowlarr/defaults/main.yml b/roles/prowlarr/defaults/main.yml index f83c950e65..80d953b4cd 100644 --- a/roles/prowlarr/defaults/main.yml +++ b/roles/prowlarr/defaults/main.yml @@ -35,9 +35,9 @@ prowlarr_paths_folders_list: prowlarr_web_subdomain: "{{ prowlarr_name }}" prowlarr_web_domain: "{{ user.domain }}" prowlarr_web_port: "9696" -prowlarr_web_url: "{{ 'https://' + prowlarr_web_subdomain + '.' + prowlarr_web_domain +prowlarr_web_url: "{{ 'https://' + (prowlarr_web_subdomain + '.' + prowlarr_web_domain if (prowlarr_web_subdomain | length > 0) - else prowlarr_web_domain }}" + else prowlarr_web_domain) }}" ################################ # DNS diff --git a/roles/qbittorrent/defaults/main.yml b/roles/qbittorrent/defaults/main.yml index 1af005f051..8a3e6921a9 100644 --- a/roles/qbittorrent/defaults/main.yml +++ b/roles/qbittorrent/defaults/main.yml @@ -62,9 +62,9 @@ qbittorrent_paths_folders_list: qbittorrent_web_subdomain: "{{ qbittorrent_name }}" qbittorrent_web_domain: "{{ user.domain }}" qbittorrent_web_port: "8080" -qbittorrent_web_url: "{{ 'https://' + lookup('vars', qbittorrent_name + '_web_subdomain', default=qbittorrent_web_subdomain) + '.' + lookup('vars', qbittorrent_name + '_web_domain', default=qbittorrent_web_domain) +qbittorrent_web_url: "{{ 'https://' + (lookup('vars', qbittorrent_name + '_web_subdomain', default=qbittorrent_web_subdomain) + '.' + lookup('vars', qbittorrent_name + '_web_domain', default=qbittorrent_web_domain) if (lookup('vars', qbittorrent_name + '_web_subdomain', default=qbittorrent_web_subdomain) | length > 0) - else lookup('vars', qbittorrent_name + '_web_domain', default=qbittorrent_web_domain) }}" + else lookup('vars', qbittorrent_name + '_web_domain', default=qbittorrent_web_domain)) }}" ################################ # DNS diff --git a/roles/radarr/defaults/main.yml b/roles/radarr/defaults/main.yml index 9e7e69e6c2..82bc9cc35c 100644 --- a/roles/radarr/defaults/main.yml +++ b/roles/radarr/defaults/main.yml @@ -36,9 +36,9 @@ radarr_paths_config_location: "{{ radarr_paths_location }}/config.xml" radarr_web_subdomain: "{{ radarr_name }}" radarr_web_domain: "{{ user.domain }}" radarr_web_port: "7878" -radarr_web_url: "{{ 'https://' + lookup('vars', radarr_name + '_web_subdomain', default=radarr_web_subdomain) + '.' + lookup('vars', radarr_name + '_web_domain', default=radarr_web_domain) +radarr_web_url: "{{ 'https://' + (lookup('vars', radarr_name + '_web_subdomain', default=radarr_web_subdomain) + '.' + lookup('vars', radarr_name + '_web_domain', default=radarr_web_domain) if (lookup('vars', radarr_name + '_web_subdomain', default=radarr_web_subdomain) | length > 0) - else lookup('vars', radarr_name + '_web_domain', default=radarr_web_domain) }}" + else lookup('vars', radarr_name + '_web_domain', default=radarr_web_domain)) }}" ################################ # DNS diff --git a/roles/readarr/defaults/main.yml b/roles/readarr/defaults/main.yml index f14ae40077..e15b4196e7 100644 --- a/roles/readarr/defaults/main.yml +++ b/roles/readarr/defaults/main.yml @@ -37,9 +37,9 @@ readarr_paths_config_location: "{{ readarr_paths_location }}/config.xml" readarr_web_subdomain: "{{ readarr_name }}" readarr_web_domain: "{{ user.domain }}" readarr_web_port: "8787" -readarr_web_url: "{{ 'https://' + lookup('vars', readarr_name + '_web_subdomain', default=readarr_web_subdomain) + '.' + lookup('vars', readarr_name + '_web_domain', default=readarr_web_domain) +readarr_web_url: "{{ 'https://' + (lookup('vars', readarr_name + '_web_subdomain', default=readarr_web_subdomain) + '.' + lookup('vars', readarr_name + '_web_domain', default=readarr_web_domain) if (lookup('vars', readarr_name + '_web_subdomain', default=readarr_web_subdomain) | length > 0) - else lookup('vars', readarr_name + '_web_domain', default=readarr_web_domain) }}" + else lookup('vars', readarr_name + '_web_domain', default=readarr_web_domain)) }}" ################################ # DNS diff --git a/roles/rutorrent/defaults/main.yml b/roles/rutorrent/defaults/main.yml index 5de256aca5..791393ca7b 100644 --- a/roles/rutorrent/defaults/main.yml +++ b/roles/rutorrent/defaults/main.yml @@ -42,9 +42,9 @@ rutorrent_paths_plugins_ini_location: "{{ rutorrent_paths_location }}/rutorrent/ rutorrent_web_subdomain: "{{ rutorrent_name }}" rutorrent_web_domain: "{{ user.domain }}" rutorrent_web_port: "80" -rutorrent_web_url: "{{ 'https://' + rutorrent_web_subdomain + '.' + rutorrent_web_domain +rutorrent_web_url: "{{ 'https://' + (rutorrent_web_subdomain + '.' + rutorrent_web_domain if (rutorrent_web_subdomain | length > 0) - else rutorrent_web_domain }}" + else rutorrent_web_domain) }}" ################################ # DNS diff --git a/roles/sabnzbd/defaults/main.yml b/roles/sabnzbd/defaults/main.yml index f7a53776f6..281b496b5c 100644 --- a/roles/sabnzbd/defaults/main.yml +++ b/roles/sabnzbd/defaults/main.yml @@ -35,9 +35,9 @@ sabnzbd_paths_config_location: "{{ sabnzbd_paths_location }}/sabnzbd.ini" sabnzbd_web_subdomain: "{{ sabnzbd_name }}" sabnzbd_web_domain: "{{ user.domain }}" sabnzbd_web_port: "8080" -sabnzbd_web_url: "{{ 'https://' + sabnzbd_web_subdomain + '.' + sabnzbd_web_domain +sabnzbd_web_url: "{{ 'https://' + (sabnzbd_web_subdomain + '.' + sabnzbd_web_domain if (sabnzbd_web_subdomain | length > 0) - else sabnzbd_web_domain }}" + else sabnzbd_web_domain) }}" sabnzbd_web_local_url: "{{ 'http://' + sabnzbd_name + ':' + sabnzbd_web_port }}" ################################ diff --git a/roles/sonarr/defaults/main.yml b/roles/sonarr/defaults/main.yml index e32e0f77c7..7fe3a61176 100644 --- a/roles/sonarr/defaults/main.yml +++ b/roles/sonarr/defaults/main.yml @@ -36,9 +36,9 @@ sonarr_paths_config_location: "{{ sonarr_paths_location }}/config.xml" sonarr_web_subdomain: "{{ sonarr_name }}" sonarr_web_domain: "{{ user.domain }}" sonarr_web_port: "8989" -sonarr_web_url: "{{ 'https://' + lookup('vars', sonarr_name + '_web_subdomain', default=sonarr_web_subdomain) + '.' + lookup('vars', sonarr_name + '_web_domain', default=sonarr_web_domain) +sonarr_web_url: "{{ 'https://' + (lookup('vars', sonarr_name + '_web_subdomain', default=sonarr_web_subdomain) + '.' + lookup('vars', sonarr_name + '_web_domain', default=sonarr_web_domain) if (lookup('vars', sonarr_name + '_web_subdomain', default=sonarr_web_subdomain) | length > 0) - else lookup('vars', sonarr_name + '_web_domain', default=sonarr_web_domain) }}" + else lookup('vars', sonarr_name + '_web_domain', default=sonarr_web_domain)) }}" ################################ # DNS diff --git a/roles/tautulli/defaults/main.yml b/roles/tautulli/defaults/main.yml index 8a7ca1371c..053b64eaec 100644 --- a/roles/tautulli/defaults/main.yml +++ b/roles/tautulli/defaults/main.yml @@ -31,9 +31,9 @@ tautulli_paths_folders_list: tautulli_web_subdomain: "{{ tautulli_name }}" tautulli_web_domain: "{{ user.domain }}" tautulli_web_port: "8181" -tautulli_web_url: "{{ 'https://' + lookup('vars', tautulli_name + '_web_subdomain', default=tautulli_web_subdomain) + '.' + lookup('vars', tautulli_name + '_web_domain', default=tautulli_web_domain) +tautulli_web_url: "{{ 'https://' + (lookup('vars', tautulli_name + '_web_subdomain', default=tautulli_web_subdomain) + '.' + lookup('vars', tautulli_name + '_web_domain', default=tautulli_web_domain) if (lookup('vars', tautulli_name + '_web_subdomain', default=tautulli_web_subdomain) | length > 0) - else lookup('vars', tautulli_name + '_web_domain', default=tautulli_web_domain) }}" + else lookup('vars', tautulli_name + '_web_domain', default=tautulli_web_domain)) }}" ################################ # DNS diff --git a/roles/transfer/defaults/main.yml b/roles/transfer/defaults/main.yml index 3a9cb63a30..d898ef3318 100644 --- a/roles/transfer/defaults/main.yml +++ b/roles/transfer/defaults/main.yml @@ -28,9 +28,9 @@ transfer_web_domain: "{{ user.domain }}" transfer_web_port: "8080" transfer_web_user: "{{ user.name }}" transfer_web_pass: "{{ user.pass }}" -transfer_web_url: "{{ 'https://' + transfer_web_subdomain + '.' + transfer_web_domain +transfer_web_url: "{{ 'https://' + (transfer_web_subdomain + '.' + transfer_web_domain if (transfer_web_subdomain | length > 0) - else transfer_web_domain }}" + else transfer_web_domain) }}" ################################ # DNS diff --git a/roles/whisparr/defaults/main.yml b/roles/whisparr/defaults/main.yml index a1658bded9..d56cfe6fb4 100644 --- a/roles/whisparr/defaults/main.yml +++ b/roles/whisparr/defaults/main.yml @@ -36,9 +36,9 @@ whisparr_paths_config_location: "{{ whisparr_paths_location }}/config.xml" whisparr_web_subdomain: "{{ whisparr_name }}" whisparr_web_domain: "{{ user.domain }}" whisparr_web_port: "6969" -whisparr_web_url: "{{ 'https://' + lookup('vars', whisparr_name + '_web_subdomain', default=whisparr_web_subdomain) + '.' + lookup('vars', whisparr_name + '_web_domain', default=whisparr_web_domain) +whisparr_web_url: "{{ 'https://' + (lookup('vars', whisparr_name + '_web_subdomain', default=whisparr_web_subdomain) + '.' + lookup('vars', whisparr_name + '_web_domain', default=whisparr_web_domain) if (lookup('vars', whisparr_name + '_web_subdomain', default=whisparr_web_subdomain) | length > 0) - else lookup('vars', whisparr_name + '_web_domain', default=whisparr_web_domain) }}" + else lookup('vars', whisparr_name + '_web_domain', default=whisparr_web_domain)) }}" ################################ # DNS