Make traefik rule more consistent with other roles

Author: thomwiggers

roles/custom/matrix-bridge-appservice-irc/defaults/main.yml

@@ -46,7 +46,8 @@ matrix_appservice_irc_config_path: "{{ matrix_appservice_irc_base_path }}/config
 matrix_appservice_irc_data_path: "{{ matrix_appservice_irc_base_path }}/data"
 
 matrix_appservice_irc_homeserver_url: ""
-matrix_appservice_irc_homeserver_media_url: '{{ matrix_homeserver_url }}/irc/'
+matrix_appservice_irc_homeserver_media_domain: '{{ matrix_server_fqn_matrix }}'
+matrix_appservice_irc_homeserver_media_path: '/irc/'
 matrix_appservice_irc_homeserver_media_bind_port: 11111
 matrix_appservice_irc_homeserver_domain: '{{ matrix_domain }}'
 matrix_appservice_irc_homeserver_enablePresence: true  # noqa var-naming
@@ -492,7 +493,7 @@ matrix_appservice_irc_container_labels_traefik_tls_certresolver: "{{ traefik_cer
 # Controls whether Traefik labels for the media proxy will be applied
 matrix_appservice_irc_container_labels_media_proxy_enabled: true
 matrix_appservice_irc_container_labels_traefik_path_prefix: "/irc"
-matrix_appservice_irc_container_labels_media_proxy_traefik_rule: "Host(`{{ matrix_server_fqn_matrix }}`) && PathPrefix(`{{ matrix_appservice_irc_container_labels_traefik_path_prefix }}`)"
+matrix_appservice_irc_container_labels_media_proxy_traefik_rule: "Host(`{{ matrix_appservice_irc_homeserver_media_domain }}`) && PathPrefix(`{{ matrix_appservice_irc_container_labels_traefik_path_prefix }}`)"
 matrix_appservice_irc_container_labels_media_proxy_traefik_priority: 2000
 matrix_appservice_irc_container_labels_media_proxy_traefik_entrypoints: "{{ matrix_appservice_irc_container_labels_traefik_entrypoints }}"
 matrix_appservice_irc_container_labels_media_proxy_traefik_tls: "{{ matrix_appservice_irc_container_labels_media_proxy_traefik_entrypoints != 'web' }}"

roles/custom/matrix-bridge-appservice-irc/templates/config.yaml.j2

@@ -143,7 +143,7 @@ ircService:
     # The port for the media proxy to listen on
     bindPort: {{ matrix_appservice_irc_homeserver_media_bind_port | to_json }}
     # The publically accessible URL to the media proxy
-    publicUrl: "{{ matrix_appservice_irc_homeserver_media_url }}"
+    publicUrl: "https://{{ matrix_appservice_irc_homeserver_media_domain }}{{ matrix_appservice_irc_homeserver_media_path }}"
 
 # Options here are generally only applicable to large-scale bridges and may have
 # consequences greater than other options in this configuration file.