diff --git a/group_vars/all.yml b/group_vars/all.yml index e1e016a4..9aa0aedc 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -784,5 +784,5 @@ ubooquity_available_externally: "false" ubooquity_data_directory: "{{ docker_home }}/ubooquity" ubooquity_user_id: "0" ubooquity_group_id: "0" -ubooquity_port_a: "2202" -ubooquity_port_b: "2203" \ No newline at end of file +ubooquity_port_webui: "2202" +ubooquity_port_admin: "2203" \ No newline at end of file diff --git a/tasks/airsonic.yml b/tasks/airsonic.yml index fe93a3a7..c6844db6 100644 --- a/tasks/airsonic.yml +++ b/tasks/airsonic.yml @@ -26,5 +26,5 @@ traefik.backend: "airsonic" traefik.frontend.rule: "Host:airsonic.{{ ansible_nas_domain }}" traefik.enable: "{{ airsonic_available_externally }}" - traefik.port: "{{ airsonic_port }}" + traefik.port: "4040" diff --git a/tasks/bazarr.yml b/tasks/bazarr.yml index 62bd3116..a606f5bc 100644 --- a/tasks/bazarr.yml +++ b/tasks/bazarr.yml @@ -27,4 +27,4 @@ traefik.backend: "bazarr" traefik.frontend.rule: "Host:bazarr.{{ ansible_nas_domain }}" traefik.enable: "{{ bazarr_available_externally }}" - traefik.port: "{{ bazarr_port }}" \ No newline at end of file + traefik.port: "6767" \ No newline at end of file diff --git a/tasks/bitwarden.yml b/tasks/bitwarden.yml index a8d9aad2..9d118c0f 100644 --- a/tasks/bitwarden.yml +++ b/tasks/bitwarden.yml @@ -23,7 +23,7 @@ labels: traefik.web.frontend.rule: "Host:bitwarden.{{ ansible_nas_domain }}" traefik.enable: "{{ bitwarden_available_externally }}" - traefik.web.port: "bitwarden_port_a" + traefik.web.port: "80" traefik.hub.frontend.rule: "Host:bitwarden.{{ ansible_nas_domain }};Path:/notifications/hub" traefik.hub.port: "bitwarden_port_b" traefik.hub.protocol: "ws" diff --git a/tasks/calibre.yml b/tasks/calibre.yml index 8545cec6..36781953 100644 --- a/tasks/calibre.yml +++ b/tasks/calibre.yml @@ -25,5 +25,5 @@ traefik.backend: "calibre" traefik.frontend.rule: "Host:calibre.{{ ansible_nas_domain }}" traefik.enable: "{{ calibre_available_externally }}" - traefik.port: "{{ calibre_port }} " + traefik.port: "8083" memory: 1g \ No newline at end of file diff --git a/tasks/cloudcmd.yml b/tasks/cloudcmd.yml index 6fe6d29b..3943b761 100644 --- a/tasks/cloudcmd.yml +++ b/tasks/cloudcmd.yml @@ -26,4 +26,4 @@ traefik.backend: "cloudcmd" traefik.frontend.rule: "Host:cloudcmd.{{ ansible_nas_domain }}" traefik.enable: "{{ cloudcmd_available_externally }}" - traefik.port: "{{ cloudcmd_port }}" \ No newline at end of file + traefik.port: "8000" \ No newline at end of file diff --git a/tasks/couchpotato.yml b/tasks/couchpotato.yml index b33893ab..c084a5bc 100644 --- a/tasks/couchpotato.yml +++ b/tasks/couchpotato.yml @@ -29,4 +29,4 @@ traefik.backend: "couchpotato" traefik.frontend.rule: "Host:couchpotato.{{ ansible_nas_domain }}" traefik.enable: "{{ couchpotato_available_externally }}" - traefik.port: "{{ couchpotato_port }}" \ No newline at end of file + traefik.port: "5050" \ No newline at end of file diff --git a/tasks/duplicati.yml b/tasks/duplicati.yml index cf7778bf..593ce80e 100644 --- a/tasks/duplicati.yml +++ b/tasks/duplicati.yml @@ -24,4 +24,4 @@ traefik.backend: "duplicati" traefik.frontend.rule: "Host:duplicati.{{ ansible_nas_domain }}" traefik.enable: "{{ duplicati_available_externally }}" - traefik.port: "{{ duplicati_port }}" + traefik.port: "8200" diff --git a/tasks/emby.yml b/tasks/emby.yml index 101434d4..38ec652c 100644 --- a/tasks/emby.yml +++ b/tasks/emby.yml @@ -28,4 +28,4 @@ traefik.backend: "emby" traefik.frontend.rule: "Host:emby.{{ ansible_nas_domain }}" traefik.enable: "{{ emby_available_externally }}" - traefik.port: "{{ emby_port_https }}" \ No newline at end of file + traefik.port: "8096" \ No newline at end of file diff --git a/tasks/firefly.yml b/tasks/firefly.yml index ed5a0213..5955d334 100644 --- a/tasks/firefly.yml +++ b/tasks/firefly.yml @@ -53,4 +53,4 @@ traefik.backend: "firefly" traefik.frontend.rule: "Host:firefly.{{ ansible_nas_domain }}" traefik.enable: "{{ firefly_available_externally }}" - traefik.port: "{{ firefly_port }}" \ No newline at end of file + traefik.port: "80" \ No newline at end of file diff --git a/tasks/gitea.yml b/tasks/gitea.yml index 8a3f3ef0..34efdfad 100644 --- a/tasks/gitea.yml +++ b/tasks/gitea.yml @@ -71,4 +71,4 @@ traefik.backend: "gitea" traefik.frontend.rule: "Host:gitea.{{ ansible_nas_domain }}" traefik.enable: "{{ gitea_available_externally }}" - traefik.port: "{{ gitea_port_http }}" + traefik.port: "3000" diff --git a/tasks/glances.yml b/tasks/glances.yml index ce1659a4..8b93b1f5 100644 --- a/tasks/glances.yml +++ b/tasks/glances.yml @@ -20,4 +20,4 @@ traefik.backend: "glances" traefik.frontend.rule: "Host:glances.{{ ansible_nas_domain }}" traefik.enable: "{{ glances_available_externally }}" - traefik.port: "{{ glances_port_one }}" \ No newline at end of file + traefik.port: "61208" \ No newline at end of file diff --git a/tasks/guacamole.yml b/tasks/guacamole.yml index 09ec4c5e..061a2058 100644 --- a/tasks/guacamole.yml +++ b/tasks/guacamole.yml @@ -55,4 +55,4 @@ traefik.backend: "guacamole" traefik.frontend.rule: "Host:guacamole.{{ ansible_nas_domain }}" traefik.enable: "{{ guacamole_available_externally }}" - traefik.port: "{{ guacamole_port }}" \ No newline at end of file + traefik.port: "8080" \ No newline at end of file diff --git a/tasks/heimdall.yml b/tasks/heimdall.yml index dc7132f3..c7e9670b 100644 --- a/tasks/heimdall.yml +++ b/tasks/heimdall.yml @@ -44,4 +44,4 @@ traefik.backend: "heimdall" traefik.frontend.rule: "Host:heimdall.{{ ansible_nas_domain }}" traefik.enable: "{{ heimdall_available_externally }}" - traefik.port: "{{ heimdall_port_http }}" \ No newline at end of file + traefik.port: "80" \ No newline at end of file diff --git a/tasks/homeassistant.yml b/tasks/homeassistant.yml index 6e1ecd42..7645fd6e 100644 --- a/tasks/homeassistant.yml +++ b/tasks/homeassistant.yml @@ -12,8 +12,6 @@ pull: true volumes: - "{{ homeassistant_data_directory }}/config:/config:rw" - ports: - - "{{ homeassistant_port }}:8123" network_mode: host restart_policy: unless-stopped env: @@ -22,6 +20,6 @@ traefik.backend: "homeassistant" traefik.frontend.rule: "Host:homeassistant.{{ ansible_nas_domain }}" traefik.enable: "{{ homeassistant_available_externally }}" - traefik.port: "{{ homeassistant_port }}" + traefik.port: "8123" traefik.frontend.headers.SSLRedirect: "true" memory: 1g diff --git a/tasks/homebridge.yml b/tasks/homebridge.yml index df43e4a9..fffd970c 100644 --- a/tasks/homebridge.yml +++ b/tasks/homebridge.yml @@ -26,4 +26,4 @@ traefik.backend: "homebridge" traefik.frontend.rule: "Host:homebridge.{{ ansible_nas_domain }}" traefik.enable: "{{ homebridge_available_externally }}" - traefik.port: "{{ homebridge_port }}" + traefik.port: "8087" diff --git a/tasks/jackett.yml b/tasks/jackett.yml index 9023ae3b..5ac80cd0 100644 --- a/tasks/jackett.yml +++ b/tasks/jackett.yml @@ -23,4 +23,4 @@ traefik.backend: "jackett" traefik.frontend.rule: "Host:jackett.{{ ansible_nas_domain }}" traefik.enable: "{{ jackett_available_externally }}" - traefik.port: "{{ jackett_port }}" \ No newline at end of file + traefik.port: "9117" \ No newline at end of file diff --git a/tasks/jellyfin.yml b/tasks/jellyfin.yml index 34251144..673cf6d7 100644 --- a/tasks/jellyfin.yml +++ b/tasks/jellyfin.yml @@ -27,4 +27,4 @@ traefik.backend: "jellyfin" traefik.frontend.rule: "Host:jellyfin.{{ ansible_nas_domain }}" traefik.enable: "{{ jellyfin_available_externally }}" - traefik.port: "{{ jellyfin_port_https }}" \ No newline at end of file + traefik.port: "8096" \ No newline at end of file diff --git a/tasks/joomla.yml b/tasks/joomla.yml index 87d0df29..c5507932 100644 --- a/tasks/joomla.yml +++ b/tasks/joomla.yml @@ -42,4 +42,4 @@ traefik.backend: "joomla" traefik.frontend.rule: "Host: joomla.{{ ansible_nas_domain }}" traefik.enable: "{{ joomla_available_externally }}" - traefik.port: "{{ joomla_port }}" \ No newline at end of file + traefik.port: "80" \ No newline at end of file diff --git a/tasks/lidarr.yml b/tasks/lidarr.yml index 86293867..0c48a8b2 100644 --- a/tasks/lidarr.yml +++ b/tasks/lidarr.yml @@ -25,4 +25,4 @@ traefik.backend: "lidarr" traefik.frontend.rule: "Host:lidarr.{{ ansible_nas_domain }}" traefik.enable: "{{ lidarr_available_externally }}" - traefik.port: "{{ lidarr_port }}" \ No newline at end of file + traefik.port: "8686" \ No newline at end of file diff --git a/tasks/minidlna.yml b/tasks/minidlna.yml index 9402700d..173657e8 100644 --- a/tasks/minidlna.yml +++ b/tasks/minidlna.yml @@ -12,7 +12,7 @@ MINIDLNA_MEDIA_DIR1: "/media1" MINIDLNA_MEDIA_DIR2: "/media2" MINIDLNA_FRIENDLY_NAME: "{{ minidlna_friendly_name }}" - MINIDLNA_PORT: "{{ minidlna_port }}" + MINIDLNA_PORT: "8201" network_mode: host restart_policy: unless-stopped memory: 1g diff --git a/tasks/miniflux.yml b/tasks/miniflux.yml index 1feef495..b5e2b24a 100644 --- a/tasks/miniflux.yml +++ b/tasks/miniflux.yml @@ -39,4 +39,4 @@ traefik.backend: "miniflux" traefik.frontend.rule: "Host:miniflux.{{ ansible_nas_domain }}" traefik.enable: "{{ miniflux_available_externally }}" - traefik.port: "{{ miniflux_port }}" \ No newline at end of file + traefik.port: "8080 \ No newline at end of file diff --git a/tasks/netdata.yml b/tasks/netdata.yml index 2ece6e16..7065a4f0 100644 --- a/tasks/netdata.yml +++ b/tasks/netdata.yml @@ -29,4 +29,4 @@ traefik.backend: "netdata" traefik.frontend.rule: "Host:netdata.{{ ansible_nas_domain }}" traefik.enable: "{{ netdata_available_externally }}" - traefik.port: "{{ netdata_port }}" \ No newline at end of file + traefik.port: "19999" \ No newline at end of file diff --git a/tasks/nextcloud.yml b/tasks/nextcloud.yml index 2bd3c05b..d712ded0 100644 --- a/tasks/nextcloud.yml +++ b/tasks/nextcloud.yml @@ -45,4 +45,4 @@ traefik.backend: "nextcloud" traefik.frontend.rule: "Host:nextcloud.{{ ansible_nas_domain }}" traefik.enable: "{{ nextcloud_available_externally }}" - traefik.port: "{{ nextcloud_port }}" \ No newline at end of file + traefik.port: "80" \ No newline at end of file diff --git a/tasks/nzbget.yml b/tasks/nzbget.yml index 3731ea14..88ad126c 100644 --- a/tasks/nzbget.yml +++ b/tasks/nzbget.yml @@ -26,4 +26,4 @@ traefik.backend: "nzbget" traefik.frontend.rule: "Host:nzbget.{{ ansible_nas_domain }}" traefik.enable: "{{ nzbget_available_externally }}" - traefik.port: "{{ nzbget_port }}" \ No newline at end of file + traefik.port: "6789" \ No newline at end of file diff --git a/tasks/openhab.yml b/tasks/openhab.yml index f7ecef17..e7ceefe9 100644 --- a/tasks/openhab.yml +++ b/tasks/openhab.yml @@ -48,4 +48,4 @@ traefik.backend: "openhab" traefik.frontend.rule: "Host:openhab.{{ ansible_nas_domain }}" traefik.enable: "{{ openhab_available_externally }}" - traefik.port: "{{ openhab_port_https }}" + traefik.port: "7777" diff --git a/tasks/portainer.yml b/tasks/portainer.yml index 8f7da5e6..ceaac16b 100644 --- a/tasks/portainer.yml +++ b/tasks/portainer.yml @@ -23,4 +23,4 @@ traefik.backend: "portainer" traefik.frontend.rule: "Host:portainer.{{ ansible_nas_domain }}" traefik.enable: "{{ portainer_available_externally }}" - traefik.port: "{{ portainer_port }}" \ No newline at end of file + traefik.port: "9000" \ No newline at end of file diff --git a/tasks/pyload.yml b/tasks/pyload.yml index baa1aa1a..e8587d73 100644 --- a/tasks/pyload.yml +++ b/tasks/pyload.yml @@ -28,4 +28,4 @@ traefik.backend: "pyload" traefik.frontend.rule: "Host:pyload.{{ ansible_nas_domain }}" traefik.enable: "{{ pyload_available_externally }}" - traefik.port: "{{ pyload_port }}" + traefik.port: "8000" diff --git a/tasks/radarr.yml b/tasks/radarr.yml index 60adc94c..a053db87 100644 --- a/tasks/radarr.yml +++ b/tasks/radarr.yml @@ -27,4 +27,4 @@ traefik.backend: "radarr" traefik.frontend.rule: "Host:radarr.{{ ansible_nas_domain }}" traefik.enable: "{{ radarr_available_externally }}" - traefik.port: "{{ radarr_port }}" \ No newline at end of file + traefik.port: "7878" \ No newline at end of file diff --git a/tasks/sickchill.yml b/tasks/sickchill.yml index c3555014..4883501f 100644 --- a/tasks/sickchill.yml +++ b/tasks/sickchill.yml @@ -34,4 +34,4 @@ traefik.backend: "sickchill" traefik.frontend.rule: "Host:sickchill.{{ ansible_nas_domain }}" traefik.enable: "{{ sickchill_available_externally }}" - traefik.port: "{{ sickchill_port }}" + traefik.port: "8081" diff --git a/tasks/sonarr.yml b/tasks/sonarr.yml index c9b86e94..e0f6d76d 100644 --- a/tasks/sonarr.yml +++ b/tasks/sonarr.yml @@ -27,4 +27,4 @@ traefik.backend: "sonarr" traefik.frontend.rule: "Host:sonarr.{{ ansible_nas_domain }}" traefik.enable: "{{ sonarr_available_externally }}" - traefik.port: "{{ sonarr_port }}" \ No newline at end of file + traefik.port: "8989" \ No newline at end of file diff --git a/tasks/stats.yml b/tasks/stats.yml index 0f8c2f77..5b885bbe 100644 --- a/tasks/stats.yml +++ b/tasks/stats.yml @@ -71,4 +71,4 @@ traefik.backend: "grafana" traefik.frontend.rule: "Host:grafana.{{ ansible_nas_domain }}" traefik.enable: "{{ grafana_available_externally }}" - traefik.port: "{{ grafana_port }}" \ No newline at end of file + traefik.port: "3000" \ No newline at end of file diff --git a/tasks/tautulli.yml b/tasks/tautulli.yml index c2774252..8f99cd29 100644 --- a/tasks/tautulli.yml +++ b/tasks/tautulli.yml @@ -28,4 +28,4 @@ traefik.backend: "tautulli" traefik.frontend.rule: "Host:tautulli.{{ ansible_nas_domain }}" traefik.enable: "{{ tautulli_available_externally }}" - traefik.port: "{{ tautulli_port }}" \ No newline at end of file + traefik.port: "8181" \ No newline at end of file diff --git a/tasks/thelounge.yml b/tasks/thelounge.yml index 25dec09c..94696948 100644 --- a/tasks/thelounge.yml +++ b/tasks/thelounge.yml @@ -30,5 +30,5 @@ traefik.backend: "thelounge" traefik.frontend.rule: "Host:thelounge.{{ ansible_nas_domain }}" traefik.enable: "{{ thelounge_available_externally }}" - traefik.port: "thelounge_port_two" + traefik.port: "9000" diff --git a/tasks/transmission.yml b/tasks/transmission.yml index c8205038..e2ce54ee 100644 --- a/tasks/transmission.yml +++ b/tasks/transmission.yml @@ -31,4 +31,4 @@ traefik.backend: "transmission" traefik.frontend.rule: "Host:transmission.{{ ansible_nas_domain }}" traefik.enable: "{{ transmission_available_externally }}" - traefik.port: "{{ transmission_webui_port }}" + traefik.port: "9091" diff --git a/tasks/transmission_with_openvpn.yml b/tasks/transmission_with_openvpn.yml index 124315da..cbfaa865 100644 --- a/tasks/transmission_with_openvpn.yml +++ b/tasks/transmission_with_openvpn.yml @@ -46,4 +46,4 @@ traefik.backend: "transmission-openvpn" traefik.frontend.rule: "Host:transmission-openvpn.{{ ansible_nas_domain }}" traefik.enable: "{{ transmission_with_openvpn_available_externally }}" - traefik.port: "{{ transmission_openvpn_webui_port }}" \ No newline at end of file + traefik.port: "9091" \ No newline at end of file diff --git a/tasks/ubooquity.yml b/tasks/ubooquity.yml index b2828c77..31e2b3a6 100644 --- a/tasks/ubooquity.yml +++ b/tasks/ubooquity.yml @@ -22,11 +22,11 @@ PGID: "{{ ubooquity_group_id|quote }}" MAXMEM: "1024" ports: - - "{{ ubooquity_port_a }}:2202" - - "{{ ubooquity_port_b }}:2203" + - "{{ ubooquity_port_webui }}:2202" + - "{{ ubooquity_port_admin }}:2203" restart_policy: unless-stopped labels: traefik.backend: "ubooquity" traefik.frontend.rule: "Host:ubooquity.{{ ansible_nas_domain }}" traefik.enable: "{{ ubooquity_available_externally }}" - traefik.port: "{{ ubooquity_port_a }}" + traefik.port: "2202" diff --git a/tasks/wallabag.yml b/tasks/wallabag.yml index cf26b086..c1a6065c 100644 --- a/tasks/wallabag.yml +++ b/tasks/wallabag.yml @@ -23,6 +23,6 @@ traefik.backend: "wallabag" traefik.frontend.rule: "Host:wallabag.{{ ansible_nas_domain }}" traefik.enable: "{{ wallabag_available_externally }}" - traefik.port: "{{ wallabag_port }}" + traefik.port: "80" traefik.frontend.headers.SSLRedirect: "true" memory: 1g \ No newline at end of file diff --git a/tasks/znc.yml b/tasks/znc.yml index 7e2e357f..63fa3a34 100644 --- a/tasks/znc.yml +++ b/tasks/znc.yml @@ -25,4 +25,4 @@ traefik.backend: "znc" traefik.frontend.rule: "Host:znc.{{ ansible_nas_domain }}" traefik.enable: "{{ znc_available_externally }}" - traefik.port: "{{ znc_port }}" \ No newline at end of file + traefik.port: "6677" \ No newline at end of file