Skip to content

Commit 27e320f

Browse files
committed
Make traefik work
1 parent 4e9f682 commit 27e320f

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,8 @@ matrix_appservice_irc_container_labels_traefik_tls_certResolver: "{{ traefik_cer
491491

492492
# Controls whether Traefik labels for the media proxy will be applied
493493
matrix_appservice_irc_container_labels_media_proxy_enabled: true
494-
matrix_appservice_irc_container_labels_media_proxy_traefik_rule: "Host(`{{ matrix_domain }}`) && PathPrefix(`/irc/`)"
494+
matrix_appservice_irc_container_labels_traefik_path_prefix: "/irc"
495+
matrix_appservice_irc_container_labels_media_proxy_traefik_rule: "Host(`{{ matrix_server_fqn_matrix }}`) && PathPrefix(`{{ matrix_appservice_irc_container_labels_traefik_path_prefix }}`)"
495496
matrix_appservice_irc_container_labels_media_proxy_traefik_priority: 2000
496497
matrix_appservice_irc_container_labels_media_proxy_traefik_entrypoints: "{{ matrix_appservice_irc_container_labels_traefik_entrypoints }}"
497498
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/labels.j2

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,33 @@ traefik.http.services.matrix-appservice-irc-media-proxy.loadbalancer.server.port
1919
# #
2020
############################################################
2121

22+
{% set middlewares = [] %}
23+
2224
traefik.http.routers.matrix-appservice-irc-media-proxy.rule={{ matrix_appservice_irc_container_labels_media_proxy_traefik_rule }}
2325

26+
{% if matrix_appservice_irc_container_labels_traefik_path_prefix != '/' %}
27+
traefik.http.middlewares.matrix-appservice-irc-media-proxy-slashless-redirect.redirectregex.regex=({{ matrix_appservice_irc_container_labels_traefik_path_prefix | quote }})$
28+
traefik.http.middlewares.matrix-appservice-irc-media-proxy-slashless-redirect.redirectregex.replacement=${1}/
29+
{% set middlewares = middlewares + ['matrix-appservice-irc-media-proxy-slashless-redirect'] %}
30+
{% endif %}
31+
32+
{% if matrix_appservice_irc_container_labels_traefik_path_prefix != '/' %}
33+
traefik.http.middlewares.matrix-appservice-irc-media-proxy-strip-prefix.stripprefix.prefixes={{ matrix_appservice_irc_container_labels_traefik_path_prefix }}
34+
{% set middlewares = middlewares + ['matrix-appservice-irc-media-proxy-strip-prefix'] %}
35+
{% endif %}
36+
37+
2438
{% if matrix_appservice_irc_container_labels_media_proxy_traefik_priority | int > 0 %}
2539
traefik.http.routers.matrix-appservice-irc-media-proxy.priority={{ matrix_appservice_irc_container_labels_media_proxy_traefik_priority }}
2640
{% endif %}
2741

2842
traefik.http.routers.matrix-appservice-irc-media-proxy.service=matrix-appservice-irc-media-proxy
2943
traefik.http.routers.matrix-appservice-irc-media-proxy.entrypoints={{ matrix_appservice_irc_container_labels_media_proxy_traefik_entrypoints }}
3044

45+
{% if middlewares | length > 0 %}
46+
traefik.http.routers.matrix-appservice-irc-media-proxy.middlewares={{ middlewares | join(',') }}
47+
{% endif %}
48+
3149
traefik.http.routers.matrix-appservice-irc-media-proxy.tls={{ matrix_appservice_irc_container_labels_media_proxy_traefik_tls | to_json }}
3250
{% if matrix_appservice_irc_container_labels_media_proxy_traefik_tls %}
3351
traefik.http.routers.matrix-appservice-irc-media-proxy.tls.certResolver={{ matrix_appservice_irc_container_labels_media_proxy_traefik_tls_certResolver }}

0 commit comments

Comments
 (0)