Просмотр исходного кода

matrix-appservice-irc: use standalone defaults for Traefik variables

Role defaults should not reference playbook-level variables like
matrix_playbook_reverse_proxy_type or traefik_entrypoint_primary,
as this breaks standalone usage of the role.

Following the pattern established by other roles (matrix-sliding-sync,
matrix-synapse-admin, matrix-media-repo, etc.), Traefik variables now
use safe standalone defaults (true, web-secure, default) while the
actual playbook wiring remains in group_vars/matrix_servers.

Also standardized certResolver variable naming to use camelCase,
consistent with other roles in the playbook.
pull/3512/head
Slavi Pantaleev 1 месяц назад
Родитель
Сommit
a41e478a95
3 измененных файлов: 7 добавлений и 7 удалений
  1. +1
    -1
      group_vars/matrix_servers
  2. +5
    -5
      roles/custom/matrix-bridge-appservice-irc/defaults/main.yml
  3. +1
    -1
      roles/custom/matrix-bridge-appservice-irc/templates/labels.j2

+ 1
- 1
group_vars/matrix_servers Просмотреть файл

@@ -867,7 +867,7 @@ matrix_appservice_irc_ircService_mediaProxy_publicUrl_scheme: "{{ 'https' if mat
matrix_appservice_irc_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}"
matrix_appservice_irc_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}"
matrix_appservice_irc_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}"
matrix_appservice_irc_container_labels_traefik_tls_certresolver: "{{ traefik_certResolver_primary }}"
matrix_appservice_irc_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" # noqa var-naming

######################################################################
#


+ 5
- 5
roles/custom/matrix-bridge-appservice-irc/defaults/main.yml Просмотреть файл

@@ -490,10 +490,10 @@ matrix_appservice_irc_container_extra_arguments: []

# matrix_appservice_irc_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container.
# To inject your own other container labels, see `matrix_appservice_irc_container_labels_additional_labels`.
matrix_appservice_irc_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}"
matrix_appservice_irc_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}"
matrix_appservice_irc_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}"
matrix_appservice_irc_container_labels_traefik_tls_certresolver: "{{ traefik_certResolver_primary }}"
matrix_appservice_irc_container_labels_traefik_enabled: true
matrix_appservice_irc_container_labels_traefik_docker_network: "{{ matrix_appservice_irc_container_network }}"
matrix_appservice_irc_container_labels_traefik_entrypoints: web-secure
matrix_appservice_irc_container_labels_traefik_tls_certResolver: default # noqa var-naming

# Controls whether Traefik labels for the media proxy will be applied
matrix_appservice_irc_container_labels_media_proxy_enabled: true
@@ -502,7 +502,7 @@ matrix_appservice_irc_container_labels_media_proxy_traefik_rule: "Host(`{{ matri
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' }}"
matrix_appservice_irc_container_labels_media_proxy_traefik_tls_certresolver: "{{ matrix_appservice_irc_container_labels_traefik_tls_certresolver }}"
matrix_appservice_irc_container_labels_media_proxy_traefik_tls_certResolver: "{{ matrix_appservice_irc_container_labels_traefik_tls_certResolver }}" # noqa var-naming

# matrix-appservice-irc container additional labels
matrix_appservice_irc_container_labels_additional_labels: ''


+ 1
- 1
roles/custom/matrix-bridge-appservice-irc/templates/labels.j2 Просмотреть файл

@@ -48,7 +48,7 @@ traefik.http.routers.matrix-appservice-irc-media-proxy.middlewares={{ middleware

traefik.http.routers.matrix-appservice-irc-media-proxy.tls={{ matrix_appservice_irc_container_labels_media_proxy_traefik_tls | to_json }}
{% if matrix_appservice_irc_container_labels_media_proxy_traefik_tls %}
traefik.http.routers.matrix-appservice-irc-media-proxy.tls.certResolver={{ matrix_appservice_irc_container_labels_media_proxy_traefik_tls_certresolver }}
traefik.http.routers.matrix-appservice-irc-media-proxy.tls.certResolver={{ matrix_appservice_irc_container_labels_media_proxy_traefik_tls_certResolver }}
{% endif %}

############################################################


Загрузка…
Отмена
Сохранить