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

Fix capitalization of cert resolver

pull/3512/head
Thom Wiggers 3 месяцев назад
Родитель
Сommit
fec9ef4dd3
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 1BB0A7CE26E363
3 измененных файлов: 4 добавлений и 4 удалений
  1. +1
    -1
      group_vars/matrix_servers
  2. +2
    -2
      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 Просмотреть файл

@@ -865,7 +865,7 @@ matrix_appservice_irc_database_container_network: "{{ postgres_container_network
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_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_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_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 }}"


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


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

@@ -487,7 +487,7 @@ matrix_appservice_irc_container_extra_arguments: []
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_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_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_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 }}"


# Controls whether Traefik labels for the media proxy will be applied # 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_media_proxy_enabled: true
@@ -496,7 +496,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_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_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: "{{ 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 }}"


# matrix-appservice-irc container additional labels # matrix-appservice-irc container additional labels
matrix_appservice_irc_container_labels_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 }} 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 %} {% 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 %} {% endif %}


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


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