From 945003497980a2aa1ceef62789790aeb8de9bc29 Mon Sep 17 00:00:00 2001 From: LooseSeal2 Date: Sat, 20 Jul 2019 04:13:19 -0700 Subject: [PATCH] Support custom subdomains and port --- apps/_core.yml | 31 ++++++++++++++++++++++++- apps/airsonic.yml | 2 +- apps/alltube.yml | 2 +- apps/avidemux.yml | 2 +- apps/bazarr.yml | 2 +- apps/beets.yml | 2 +- apps/booksonic.yml | 2 +- apps/cadvisor.yml | 2 +- apps/calibre-web.yml | 2 +- apps/cloudcmd.yml | 2 +- apps/deezloaderremix.yml | 2 +- apps/deluge-vpn.yml | 2 +- apps/deluge.yml | 2 +- apps/domoticz.yml | 2 +- apps/dozzle.yml | 2 +- apps/duplicati.yml | 2 +- apps/embystats.yml | 2 +- apps/filebot.yml | 2 +- apps/filezilla.yml | 2 +- apps/firefox.yml | 2 +- apps/flexget.yml | 2 +- apps/flextv.yml | 2 +- apps/gazee.yml | 2 +- apps/gitea.yml | 2 +- apps/handbrake.yml | 2 +- apps/headphones.yml | 2 +- apps/heimdall.yml | 2 +- apps/htpcmanager.yml | 2 +- apps/jd2-openvpn.yml | 2 +- apps/jdownloader2.yml | 2 +- apps/kitana.yml | 2 +- apps/logarr.yml | 2 +- apps/makemkv.yml | 2 +- apps/mariadb.yml | 2 +- apps/mediainfo.yml | 2 +- apps/medusa.yml | 2 +- apps/mellow.yml | 2 +- apps/mkvtoolnix.yml | 2 +- apps/monitorr.yml | 2 +- apps/muximux.yml | 2 +- apps/mylar.yml | 2 +- apps/nextcloud.yml | 2 +- apps/nowshowing.yml | 2 +- apps/nzbget-mp4.yml | 2 +- apps/ombi4k.yml | 2 +- apps/ombiHDR.yml | 2 +- apps/organizr.yml | 2 +- apps/pyload.yml | 2 +- apps/qbittorrent-vpn.yml | 2 +- apps/radarr4k.yml | 2 +- apps/radarrhdr.yml | 2 +- apps/rclonebrowser.yml | 2 +- apps/rdp-calibre.yml | 2 +- apps/resilio.yml | 2 +- apps/rflood-vpn.yml | 2 +- apps/rutorrent-vpn.yml | 2 +- apps/sharesite.yml | 2 +- apps/shoko.yml | 2 +- apps/sonarr4k.yml | 2 +- apps/sonarrhdr.yml | 2 +- apps/speedtest.yml | 2 +- apps/subsonic.yml | 2 +- apps/syncthing.yml | 2 +- apps/teamspeak3.yml | 2 +- apps/templates/broken/kodi-headless.yml | 2 +- apps/templates/broken/nzbthrottle.yml | 2 +- apps/thelounge.yml | 2 +- apps/traktor.yml | 2 +- apps/transmission-vpn.yml | 2 +- apps/ubooquity.yml | 2 +- apps/unifi.yml | 2 +- apps/varken.yml | 2 +- apps/vnc-xfce.yml | 2 +- apps/xteve.yml | 2 +- apps/zammad.yml | 2 +- 75 files changed, 104 insertions(+), 75 deletions(-) diff --git a/apps/_core.yml b/apps/_core.yml index 214fb60..66557d5 100644 --- a/apps/_core.yml +++ b/apps/_core.yml @@ -38,6 +38,35 @@ register: auth ignore_errors: True +- name: Register Program Name + shell: 'cat /tmp/program_var' + register: program + ignore_errors: True + +- name: Register ucname + shell: 'cat /var/plexguide/{{program.stdout}}.cname' + register: ucname + ignore_errors: True + +- name: Register CName + set_fact: + cname: "" + +- name: Set cname + set_fact: + cname: ",{{ucname.stdout}}.{{domain.stdout}}" + when: ucname is succeeded and ucname.stdout != "" + +- name: Register External Port + shell: 'cat /var/plexguide/{{program.stdout}}.port' + register: ueport + ignore_errors: True + +- name: Change extport + set_fact: + extport: "{{ueport.stdout}}" + when: ueport is succeeded and ueport.stdout != "" + - name: Remove {{pgrole}} Container docker_container: name: '{{pgrole}}' @@ -90,7 +119,7 @@ - name: 'If Fact Matches - Enable TLD' set_fact: - tldset: '{{domain.stdout}},www.{{domain.stdout}}' + tldset: ',{{domain.stdout}},www.{{domain.stdout}}' when: 'toplevel.stdout == pgrole' - debug: msg="TLDSET is now for {{toplevel.stdout}}" diff --git a/apps/airsonic.yml b/apps/airsonic.yml index d889824..9edb71d 100644 --- a/apps/airsonic.yml +++ b/apps/airsonic.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/alltube.yml b/apps/alltube.yml index f59552d..615cef1 100644 --- a/apps/alltube.yml +++ b/apps/alltube.yml @@ -39,7 +39,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/avidemux.yml b/apps/avidemux.yml index 2ce95c6..eaaea38 100644 --- a/apps/avidemux.yml +++ b/apps/avidemux.yml @@ -48,7 +48,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/bazarr.yml b/apps/bazarr.yml index 37f67b2..a4cc203 100644 --- a/apps/bazarr.yml +++ b/apps/bazarr.yml @@ -28,7 +28,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/beets.yml b/apps/beets.yml index 280b0cf..db2d0bd 100644 --- a/apps/beets.yml +++ b/apps/beets.yml @@ -35,7 +35,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/booksonic.yml b/apps/booksonic.yml index ea8ab13..7b75dd9 100644 --- a/apps/booksonic.yml +++ b/apps/booksonic.yml @@ -30,7 +30,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/cadvisor.yml b/apps/cadvisor.yml index 3964434..d5e94ba 100644 --- a/apps/cadvisor.yml +++ b/apps/cadvisor.yml @@ -29,7 +29,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/calibre-web.yml b/apps/calibre-web.yml index 28bb6f7..b52cfed 100644 --- a/apps/calibre-web.yml +++ b/apps/calibre-web.yml @@ -29,7 +29,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/cloudcmd.yml b/apps/cloudcmd.yml index 4368911..e7298a1 100644 --- a/apps/cloudcmd.yml +++ b/apps/cloudcmd.yml @@ -28,7 +28,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/deezloaderremix.yml b/apps/deezloaderremix.yml index 568aea4..1c303cb 100644 --- a/apps/deezloaderremix.yml +++ b/apps/deezloaderremix.yml @@ -28,7 +28,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/deluge-vpn.yml b/apps/deluge-vpn.yml index ddf61bf..c244065 100644 --- a/apps/deluge-vpn.yml +++ b/apps/deluge-vpn.yml @@ -42,7 +42,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/deluge.yml b/apps/deluge.yml index 71ad008..b8bb4d8 100644 --- a/apps/deluge.yml +++ b/apps/deluge.yml @@ -43,7 +43,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/domoticz.yml b/apps/domoticz.yml index 3ff918a..e93d810 100644 --- a/apps/domoticz.yml +++ b/apps/domoticz.yml @@ -32,7 +32,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/dozzle.yml b/apps/dozzle.yml index 56f980e..03d306b 100644 --- a/apps/dozzle.yml +++ b/apps/dozzle.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/duplicati.yml b/apps/duplicati.yml index 4d71f83..204240d 100644 --- a/apps/duplicati.yml +++ b/apps/duplicati.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/embystats.yml b/apps/embystats.yml index 9b44c51..c277a65 100644 --- a/apps/embystats.yml +++ b/apps/embystats.yml @@ -32,7 +32,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/filebot.yml b/apps/filebot.yml index c405a83..963e3b3 100644 --- a/apps/filebot.yml +++ b/apps/filebot.yml @@ -30,7 +30,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/filezilla.yml b/apps/filezilla.yml index 8007685..5f88835 100644 --- a/apps/filezilla.yml +++ b/apps/filezilla.yml @@ -40,7 +40,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/firefox.yml b/apps/firefox.yml index 2fcb291..d333cc4 100644 --- a/apps/firefox.yml +++ b/apps/firefox.yml @@ -48,7 +48,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/flexget.yml b/apps/flexget.yml index 7b8ac24..f3b8298 100644 --- a/apps/flexget.yml +++ b/apps/flexget.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/flextv.yml b/apps/flextv.yml index b8d54dc..0d28c5f 100644 --- a/apps/flextv.yml +++ b/apps/flextv.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/gazee.yml b/apps/gazee.yml index 5bc7313..c383e96 100644 --- a/apps/gazee.yml +++ b/apps/gazee.yml @@ -32,7 +32,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/gitea.yml b/apps/gitea.yml index 5c418e2..88d0e53 100644 --- a/apps/gitea.yml +++ b/apps/gitea.yml @@ -31,7 +31,7 @@ ##########traefik.frontend.auth.forward.address: '{{gauth}}' ##Disabled OAuth as you cant user terminal for cloning any repo traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/handbrake.yml b/apps/handbrake.yml index 9341c1c..fa82349 100644 --- a/apps/handbrake.yml +++ b/apps/handbrake.yml @@ -29,7 +29,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/headphones.yml b/apps/headphones.yml index db4e3c6..eb2267e 100644 --- a/apps/headphones.yml +++ b/apps/headphones.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/heimdall.yml b/apps/heimdall.yml index 77fcf5f..ec4d0c9 100644 --- a/apps/heimdall.yml +++ b/apps/heimdall.yml @@ -31,7 +31,7 @@ traefik.enable: 'true' traefik.https.port: '443' traefik.https.frontend.entryPoints: 'https' - traefik.https.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.https.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' - name: 'Setting PG Volumes' set_fact: diff --git a/apps/htpcmanager.yml b/apps/htpcmanager.yml index 61cc830..4058979 100644 --- a/apps/htpcmanager.yml +++ b/apps/htpcmanager.yml @@ -28,7 +28,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/jd2-openvpn.yml b/apps/jd2-openvpn.yml index 1da5c7d..1888d5d 100644 --- a/apps/jd2-openvpn.yml +++ b/apps/jd2-openvpn.yml @@ -44,7 +44,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/jdownloader2.yml b/apps/jdownloader2.yml index ae2d803..7c10adf 100644 --- a/apps/jdownloader2.yml +++ b/apps/jdownloader2.yml @@ -44,7 +44,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/kitana.yml b/apps/kitana.yml index 79a9cc2..d3f35a2 100644 --- a/apps/kitana.yml +++ b/apps/kitana.yml @@ -29,7 +29,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/logarr.yml b/apps/logarr.yml index dc8d4b6..4fe18b5 100644 --- a/apps/logarr.yml +++ b/apps/logarr.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/makemkv.yml b/apps/makemkv.yml index e1f7a57..6e99727 100644 --- a/apps/makemkv.yml +++ b/apps/makemkv.yml @@ -31,7 +31,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/mariadb.yml b/apps/mariadb.yml index 885213d..8a3b91c 100644 --- a/apps/mariadb.yml +++ b/apps/mariadb.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/mediainfo.yml b/apps/mediainfo.yml index c37065f..956dfe4 100644 --- a/apps/mediainfo.yml +++ b/apps/mediainfo.yml @@ -30,7 +30,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/medusa.yml b/apps/medusa.yml index ff18f99..e26c60c 100644 --- a/apps/medusa.yml +++ b/apps/medusa.yml @@ -32,7 +32,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/mellow.yml b/apps/mellow.yml index 1fe60b1..9ce4738 100644 --- a/apps/mellow.yml +++ b/apps/mellow.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/mkvtoolnix.yml b/apps/mkvtoolnix.yml index 37662ad..c2d869d 100644 --- a/apps/mkvtoolnix.yml +++ b/apps/mkvtoolnix.yml @@ -41,7 +41,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/monitorr.yml b/apps/monitorr.yml index ea3a0c3..598997c 100644 --- a/apps/monitorr.yml +++ b/apps/monitorr.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/muximux.yml b/apps/muximux.yml index 0002bae..963c789 100644 --- a/apps/muximux.yml +++ b/apps/muximux.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/mylar.yml b/apps/mylar.yml index 63aeba7..ac9cecb 100644 --- a/apps/mylar.yml +++ b/apps/mylar.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/nextcloud.yml b/apps/nextcloud.yml index 3c75ef8..7dc49da 100644 --- a/apps/nextcloud.yml +++ b/apps/nextcloud.yml @@ -30,7 +30,7 @@ traefik.enable: 'true' traefik.https.port: '443' traefik.https.frontend.entryPoints: 'https' - traefik.https.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.https.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' - name: 'Setting PG Volumes' set_fact: diff --git a/apps/nowshowing.yml b/apps/nowshowing.yml index c0a73b1..a945ca8 100644 --- a/apps/nowshowing.yml +++ b/apps/nowshowing.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/nzbget-mp4.yml b/apps/nzbget-mp4.yml index 134503b..c989d2d 100644 --- a/apps/nzbget-mp4.yml +++ b/apps/nzbget-mp4.yml @@ -131,7 +131,7 @@ pg_labels: traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/ombi4k.yml b/apps/ombi4k.yml index c84bcd0..3b6a343 100644 --- a/apps/ombi4k.yml +++ b/apps/ombi4k.yml @@ -45,7 +45,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/ombiHDR.yml b/apps/ombiHDR.yml index a4fa977..25d7adf 100644 --- a/apps/ombiHDR.yml +++ b/apps/ombiHDR.yml @@ -45,7 +45,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/organizr.yml b/apps/organizr.yml index 2a89008..d0f9af6 100644 --- a/apps/organizr.yml +++ b/apps/organizr.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/pyload.yml b/apps/pyload.yml index 879cb43..0b9186e 100644 --- a/apps/pyload.yml +++ b/apps/pyload.yml @@ -31,7 +31,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/qbittorrent-vpn.yml b/apps/qbittorrent-vpn.yml index d613eae..fa70890 100644 --- a/apps/qbittorrent-vpn.yml +++ b/apps/qbittorrent-vpn.yml @@ -45,7 +45,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/radarr4k.yml b/apps/radarr4k.yml index 630c299..7834e31 100644 --- a/apps/radarr4k.yml +++ b/apps/radarr4k.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/radarrhdr.yml b/apps/radarrhdr.yml index 3b2374f..c6e691c 100644 --- a/apps/radarrhdr.yml +++ b/apps/radarrhdr.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/rclonebrowser.yml b/apps/rclonebrowser.yml index 7d12f01..998974e 100644 --- a/apps/rclonebrowser.yml +++ b/apps/rclonebrowser.yml @@ -30,7 +30,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/rdp-calibre.yml b/apps/rdp-calibre.yml index b6e2f59..aa9c2e9 100644 --- a/apps/rdp-calibre.yml +++ b/apps/rdp-calibre.yml @@ -30,7 +30,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/resilio.yml b/apps/resilio.yml index 3ce93dd..7317a08 100644 --- a/apps/resilio.yml +++ b/apps/resilio.yml @@ -47,7 +47,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/rflood-vpn.yml b/apps/rflood-vpn.yml index ecac351..5e1329d 100644 --- a/apps/rflood-vpn.yml +++ b/apps/rflood-vpn.yml @@ -40,7 +40,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/rutorrent-vpn.yml b/apps/rutorrent-vpn.yml index 7f34005..563b9ce 100644 --- a/apps/rutorrent-vpn.yml +++ b/apps/rutorrent-vpn.yml @@ -40,7 +40,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/sharesite.yml b/apps/sharesite.yml index da227b7..75a0790 100644 --- a/apps/sharesite.yml +++ b/apps/sharesite.yml @@ -40,7 +40,7 @@ traefik.port: '{{intport}}' traefik.frontend.headers.customResponseHeaders: 'X-Robots-Tag:noindex,nofollow,nosnippet,noarchive,notranslate,noimageindex' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/shoko.yml b/apps/shoko.yml index 7b42583..aca857f 100644 --- a/apps/shoko.yml +++ b/apps/shoko.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml index e3b12f5..df5dc42 100644 --- a/apps/sonarr4k.yml +++ b/apps/sonarr4k.yml @@ -29,7 +29,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/sonarrhdr.yml b/apps/sonarrhdr.yml index 7a1e1db..c622477 100644 --- a/apps/sonarrhdr.yml +++ b/apps/sonarrhdr.yml @@ -29,7 +29,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/speedtest.yml b/apps/speedtest.yml index a4caa63..91a0f53 100644 --- a/apps/speedtest.yml +++ b/apps/speedtest.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/subsonic.yml b/apps/subsonic.yml index 8ebe287..3ceec08 100644 --- a/apps/subsonic.yml +++ b/apps/subsonic.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/syncthing.yml b/apps/syncthing.yml index fc4c45f..5523cd1 100644 --- a/apps/syncthing.yml +++ b/apps/syncthing.yml @@ -40,7 +40,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/teamspeak3.yml b/apps/teamspeak3.yml index 896de28..897d2f0 100644 --- a/apps/teamspeak3.yml +++ b/apps/teamspeak3.yml @@ -41,7 +41,7 @@ traefik.enable: 'false' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/templates/broken/kodi-headless.yml b/apps/templates/broken/kodi-headless.yml index 578eb6e..33aeb0a 100644 --- a/apps/templates/broken/kodi-headless.yml +++ b/apps/templates/broken/kodi-headless.yml @@ -32,7 +32,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/templates/broken/nzbthrottle.yml b/apps/templates/broken/nzbthrottle.yml index edae42e..785547d 100644 --- a/apps/templates/broken/nzbthrottle.yml +++ b/apps/templates/broken/nzbthrottle.yml @@ -34,7 +34,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/thelounge.yml b/apps/thelounge.yml index 65a7ba1..4e8d21f 100644 --- a/apps/thelounge.yml +++ b/apps/thelounge.yml @@ -29,7 +29,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/traktor.yml b/apps/traktor.yml index 5a0d4c3..d2b9314 100644 --- a/apps/traktor.yml +++ b/apps/traktor.yml @@ -29,7 +29,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/transmission-vpn.yml b/apps/transmission-vpn.yml index 7106d5e..80a6a08 100644 --- a/apps/transmission-vpn.yml +++ b/apps/transmission-vpn.yml @@ -42,7 +42,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/ubooquity.yml b/apps/ubooquity.yml index 58861bb..6d1b048 100644 --- a/apps/ubooquity.yml +++ b/apps/ubooquity.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/unifi.yml b/apps/unifi.yml index 10cf25a..a686d91 100644 --- a/apps/unifi.yml +++ b/apps/unifi.yml @@ -39,7 +39,7 @@ traefik.tags: 'frontend' traefik.frontend.passHostHeader: 'true' traefik.backend: '{{pgrole}}' - traefik.admin.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.admin.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.admin.port: '{{intport5}}' traefik.admin.protocol: 'https' traefik.frontend.headers.SSLRedirect: 'true' diff --git a/apps/varken.yml b/apps/varken.yml index 775e772..b18b6e4 100644 --- a/apps/varken.yml +++ b/apps/varken.yml @@ -32,7 +32,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/vnc-xfce.yml b/apps/vnc-xfce.yml index f1aba3b..3c33680 100644 --- a/apps/vnc-xfce.yml +++ b/apps/vnc-xfce.yml @@ -28,7 +28,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/xteve.yml b/apps/xteve.yml index b771227..9027d05 100644 --- a/apps/xteve.yml +++ b/apps/xteve.yml @@ -30,7 +30,7 @@ traefik.enable: 'true' traefik.port: '{{intport}}' traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true' diff --git a/apps/zammad.yml b/apps/zammad.yml index 931ad2f..22348f8 100644 --- a/apps/zammad.yml +++ b/apps/zammad.yml @@ -32,7 +32,7 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}}{{tldset}}{{cname}}' traefik.frontend.headers.SSLHost: '{{domain.stdout}}' traefik.frontend.headers.SSLRedirect: 'true' traefik.frontend.headers.STSIncludeSubdomains: 'true'