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

Make traefik work

pull/3512/head
Thom Wiggers 5 месяцев назад
Родитель
Сommit
2efa58b01c
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 1BB0A7CE26E363
2 измененных файлов: 20 добавлений и 1 удалений
  1. +2
    -1
      roles/custom/matrix-bridge-appservice-irc/defaults/main.yml
  2. +18
    -0
      roles/custom/matrix-bridge-appservice-irc/templates/labels.j2

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

@@ -491,7 +491,8 @@ 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_media_proxy_traefik_rule: "Host(`{{ matrix_domain }}`) && PathPrefix(`/irc/`)"
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_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' }}"


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

@@ -19,8 +19,22 @@ traefik.http.services.matrix-appservice-irc-media-proxy.loadbalancer.server.port
# #
############################################################

{% set middlewares = [] %}

traefik.http.routers.matrix-appservice-irc-media-proxy.rule={{ matrix_appservice_irc_container_labels_media_proxy_traefik_rule }}

{% if matrix_appservice_irc_container_labels_traefik_path_prefix != '/' %}
traefik.http.middlewares.matrix-appservice-irc-media-proxy-slashless-redirect.redirectregex.regex=({{ matrix_appservice_irc_container_labels_traefik_path_prefix | quote }})$
traefik.http.middlewares.matrix-appservice-irc-media-proxy-slashless-redirect.redirectregex.replacement=${1}/
{% set middlewares = middlewares + ['matrix-appservice-irc-media-proxy-slashless-redirect'] %}
{% endif %}

{% if matrix_appservice_irc_container_labels_traefik_path_prefix != '/' %}
traefik.http.middlewares.matrix-appservice-irc-media-proxy-strip-prefix.stripprefix.prefixes={{ matrix_appservice_irc_container_labels_traefik_path_prefix }}
{% set middlewares = middlewares + ['matrix-appservice-irc-media-proxy-strip-prefix'] %}
{% endif %}


{% if matrix_appservice_irc_container_labels_media_proxy_traefik_priority | int > 0 %}
traefik.http.routers.matrix-appservice-irc-media-proxy.priority={{ matrix_appservice_irc_container_labels_media_proxy_traefik_priority }}
{% endif %}
@@ -28,6 +42,10 @@ traefik.http.routers.matrix-appservice-irc-media-proxy.priority={{ matrix_appser
traefik.http.routers.matrix-appservice-irc-media-proxy.service=matrix-appservice-irc-media-proxy
traefik.http.routers.matrix-appservice-irc-media-proxy.entrypoints={{ matrix_appservice_irc_container_labels_media_proxy_traefik_entrypoints }}

{% if middlewares | length > 0 %}
traefik.http.routers.matrix-appservice-irc-media-proxy.middlewares={{ middlewares | join(',') }}
{% endif %}

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 }}


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