Skip to content

Commit

Permalink
various: fix web_url
Browse files Browse the repository at this point in the history
Was previously leaving out https:// when not using a subdomain.
  • Loading branch information
saltydk committed Sep 5, 2023
1 parent 941ddbb commit ce3cba1
Show file tree
Hide file tree
Showing 32 changed files with 66 additions and 66 deletions.
4 changes: 2 additions & 2 deletions roles/authelia/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/autobrr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/autoscan/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/bazarr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/deluge/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/dozzle/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/emby/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/grafana/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/jackett/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/jaeger/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/jellyfin/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/lidarr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/lldap/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/netdata/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/nginx/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/nzbhydra2/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/organizr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/overseerr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/petio/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions roles/plex/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/portainer/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/prometheus/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/prowlarr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/qbittorrent/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/radarr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/readarr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/rutorrent/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit ce3cba1

Please sign in to comment.