finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make Traefik labels files look better

Browse Source 
This moves the comments from being just in Jinja,
to actually ending up in the generated `labels` file,
which makes inspection of the final result easier.

Also, some new lines were added here and there to make labels
more legible.

The generated file may still include weird new-lines due to
various `if` statements yielding content or not, but that's not so ugly
anymore - now that we have proper start/end sections that are visible in
the final `labels` file.
This commit is contained in:
Slavi Pantaleev
2024-01-15 10:41:15 +02:00
parent b9148675db
commit 48a4afb114
26 changed files with 948 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
roles/custom/matrix-media-repo/templates/media-repo/labels.j2
View File

@ -18,9 +18,11 @@ traefik.http.middlewares.matrix-media-repo-add-headers.headers.customrequesthead
# Matrix Client
{#
Public Media (/_matrix/media)
#}
############################################################
# #
# Public Media (/_matrix/media) #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-media.rule={{ matrix_media_repo_container_labels_traefik_media_rule }}
@ -40,15 +42,20 @@ traefik.http.routers.matrix-media-repo-public-media.tls={{ matrix_media_repo_con
traefik.http.routers.matrix-media-repo-public-media.tls.certResolver={{ matrix_media_repo_container_labels_traefik_media_tls_certResolver }}
{% endif %}
{#
/Public Media (/_matrix/media)
#}
############################################################
# #
# /Public Media (/_matrix/media) #
# #
############################################################
{#
Internal Media (/_matrix/media)
#}
{% if matrix_media_repo_container_labels_traefik_internal_media_enabled %}
############################################################
# #
# Internal Media (/_matrix/media) #
# #
############################################################
traefik.http.routers.matrix-media-repo-internal-media.rule={{ matrix_media_repo_container_labels_traefik_internal_media_rule }}
{% if matrix_media_repo_container_labels_traefik_internal_media_priority | int > 0 %}
@ -62,16 +69,21 @@ traefik.http.routers.matrix-media-repo-internal-media.middlewares={{ middlewares
traefik.http.routers.matrix-media-repo-internal-media.service=matrix-media-repo
traefik.http.routers.matrix-media-repo-internal-media.entrypoints={{ matrix_media_repo_container_labels_traefik_internal_media_entrypoints }}
############################################################
# #
# /Internal Media (/_matrix/media) #
# #
############################################################
{% endif %}
{#
/Internal Media (/_matrix/media)
#}
{#
Public Client Logout (/_matrix/client/r0/logout, /_matrix/client/r0/logout/all)
#}
{% if matrix_media_repo_access_tokens_max_cache_time_seconds > 0 %}
############################################################
# #
# Public Client Logout #
# (/_matrix/client/r0/{logout,logout/all} #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-logout.rule={{ matrix_media_repo_container_labels_traefik_logout_rule }}
@ -91,15 +103,20 @@ traefik.http.routers.matrix-media-repo-public-logout.tls={{ matrix_media_repo_co
traefik.http.routers.matrix-media-repo-public-logout.tls.certResolver={{ matrix_media_repo_container_labels_traefik_logout_tls_certResolver }}
{% endif %}
############################################################
# #
# /Public Client Logout #
# (/_matrix/client/r0/{logout,logout/all} #
# #
############################################################
{% endif %}
{#
/Public Client Logout (/_matrix/client/r0/logout, /_matrix/client/r0/logout/all)
#}
{#
Public Client Admin (/_matrix/client/r0/admin/*)
#}
############################################################
# #
# Public Client Admin (/_matrix/client/r0/admin/*) #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-admin-federation.rule={{ matrix_media_repo_container_labels_traefik_admin_rule }}
@ -119,14 +136,19 @@ traefik.http.routers.matrix-media-repo-public-admin-federation.tls={{ matrix_med
traefik.http.routers.matrix-media-repo-public-admin-federation.tls.certResolver={{ matrix_media_repo_container_labels_traefik_admin_tls_certResolver }}
{% endif %}
{#
/Public Client Admin (/_matrix/client/r0/admin/*)
#}
############################################################
# #
# /Public Client Admin (/_matrix/client/r0/admin/*) #
# #
############################################################
{#
Public Client t2bot APIs (/_matrix/client/unstable/io.t2bot.media)
#}
############################################################
# #
# Public Client t2bot APIs #
# (/_matrix/client/unstable/io.t2bot.media) #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-t2bot.rule={{ matrix_media_repo_container_labels_traefik_t2bot_rule }}
@ -146,17 +168,22 @@ traefik.http.routers.matrix-media-repo-public-t2bot.tls={{ matrix_media_repo_con
traefik.http.routers.matrix-media-repo-public-t2bot.tls.certResolver={{ matrix_media_repo_container_labels_traefik_t2bot_tls_certResolver }}
{% endif %}
{#
/Public Client t2bot APIs (/_matrix/client/unstable/io.t2bot.media)
#}
############################################################
# #
# /Public Client t2bot APIs #
# (/_matrix/client/unstable/io.t2bot.media) #
# #
############################################################
{% if matrix_media_repo_homeserver_federation_enabled %}
# Matrix Federation
{#
Public Federation Media (/_matrix/media)
#}
############################################################
# #
# Public Federation Media (/_matrix/media) #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-media-federation.rule={{ matrix_media_repo_container_labels_traefik_media_federation_rule }}
@ -176,15 +203,20 @@ traefik.http.routers.matrix-media-repo-public-media-federation.tls={{ matrix_med
traefik.http.routers.matrix-media-repo-public-media-federation.tls.certResolver={{ matrix_media_repo_container_labels_traefik_media_federation_tls_certResolver }}
{% endif %}
{#
/Public Federation Media (/_matrix/media)
#}
############################################################
# #
# /Public Federation Media (/_matrix/media) #
# #
############################################################
{#
Public Federation Logout (/_matrix/client/r0/logout, /_matrix/client/r0/logout/all)
#}
{% if matrix_media_repo_access_tokens_max_cache_time_seconds > 0 %}
############################################################
# #
# Public Federation Logout #
# (/_matrix/client/r0/{logout,logout/all} #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-logout-federation.rule={{ matrix_media_repo_container_labels_traefik_logout_federation_rule }}
@ -204,15 +236,20 @@ traefik.http.routers.matrix-media-repo-public-logout-federation.tls={{ matrix_me
traefik.http.routers.matrix-media-repo-public-logout-federation.tls.certResolver={{ matrix_media_repo_container_labels_traefik_logout_federation_tls_certResolver }}
{% endif %}
############################################################
# #
# /Public Federation Logout #
# (/_matrix/client/r0/{logout,logout/all} #
# #
############################################################
{% endif %}
{#
/Public Federation Logout (/_matrix/client/r0/logout, /_matrix/client/r0/logout/all)
#}
{#
Public Federation Admin (/_matrix/client/r0/admin/*)
#}
############################################################
# #
# Public Federation Admin (/_matrix/client/r0/admin/*) #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-admin.rule={{ matrix_media_repo_container_labels_traefik_admin_federation_rule }}
@ -232,13 +269,19 @@ traefik.http.routers.matrix-media-repo-public-admin.tls={{ matrix_media_repo_con
traefik.http.routers.matrix-media-repo-public-admin.tls.certResolver={{ matrix_media_repo_container_labels_traefik_admin_federation_tls_certResolver }}
{% endif %}
{#
/Public Federation Admin (/_matrix/client/r0/admin/*)
#}
############################################################
# #
# /Public Federation Admin (/_matrix/client/r0/admin/*) #
# #
############################################################
{#
Public Federation t2bot APIs (/_matrix/client/unstable/io.t2bot.media)
#}
############################################################
# #
# Public Federation t2bot APIs #
# (/_matrix/client/unstable/io.t2bot.media) #
# #
############################################################
traefik.http.routers.matrix-media-repo-public-t2bot-federation.rule={{ matrix_media_repo_container_labels_traefik_t2bot_federation_rule }}
@ -258,12 +301,16 @@ traefik.http.routers.matrix-media-repo-public-t2bot-federation.tls={{ matrix_med
traefik.http.routers.matrix-media-repo-public-t2bot-federation.tls.certResolver={{ matrix_media_repo_container_labels_traefik_t2bot_federation_tls_certResolver }}
{% endif %}
{#
Public Federation t2bot APIs (/_matrix/client/unstable/io.t2bot.media)
#}
############################################################
# #
# /Public Federation t2bot APIs #
# (/_matrix/client/unstable/io.t2bot.media) #
# #
############################################################
{% endif %} {# end of matrix_media_repo_homeserver_federation_enabled if-check #}
{% endif %}
{% endif %} {# end of matrix_media_repo_container_labels_traefik_enabled if-check #}
{{ matrix_media_repo_container_labels_additional_labels }}