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

65
roles/custom/matrix-conduit/templates/labels.j2
View File

@ -8,10 +8,12 @@ traefik.docker.network={{ matrix_conduit_container_labels_traefik_docker_network
traefik.http.services.matrix-conduit.loadbalancer.server.port={{ matrix_conduit_port_number }}
{#
Public Root path (/)
#}
{% if matrix_conduit_container_labels_public_client_root_enabled %}
############################################################
# #
# Public Root path (/) #
# #
############################################################
{% set client_root_middlewares = [] %}
@ -37,16 +39,20 @@ traefik.http.routers.matrix-conduit-public-client-root.tls={{ matrix_conduit_con
traefik.http.routers.matrix-conduit-public-client-root.tls.certResolver={{ matrix_conduit_container_labels_public_client_root_traefik_tls_certResolver }}
{% endif %}
############################################################
# #
# /Public Root path (/) #
# #
############################################################
{% endif %}
{#
/Public Root path (/)
#}
{#
Public Client-API (/_matrix)
#}
{% if matrix_conduit_container_labels_public_client_api_enabled %}
############################################################
# #
# Public Client-API (/_matrix) #
# #
############################################################
traefik.http.routers.matrix-conduit-public-client-api.rule={{ matrix_conduit_container_labels_public_client_api_traefik_rule }}
@ -62,16 +68,20 @@ traefik.http.routers.matrix-conduit-public-client-api.tls={{ matrix_conduit_cont
traefik.http.routers.matrix-conduit-public-client-api.tls.certResolver={{ matrix_conduit_container_labels_public_client_api_traefik_tls_certResolver }}
{% endif %}
############################################################
# #
# /Public Client-API (/_matrix) #
# #
############################################################
{% endif %}
{#
/Public Client-API (/_matrix)
#}
{#
Internal Client-API (/_matrix)
#}
{% if matrix_conduit_container_labels_internal_client_api_enabled %}
############################################################
# #
# Internal Client-API (/_matrix) #
# #
############################################################
traefik.http.routers.matrix-conduit-public-client-api.rule={{ matrix_conduit_container_labels_internal_client_api_traefik_rule }}
@ -82,16 +92,20 @@ traefik.http.routers.matrix-conduit-public-client-api.priority={{ matrix_conduit
traefik.http.routers.matrix-conduit-public-client-api.service=matrix-conduit
traefik.http.routers.matrix-conduit-public-client-api.entrypoints={{ matrix_conduit_container_labels_internal_client_api_traefik_entrypoints }}
############################################################
# #
# /Internal Client-API (/_matrix) #
# #
############################################################
{% endif %}
{#
/Internal Client-API (/_matrix)
#}
{#
Public Federation-API (/_matrix)
#}
{% if matrix_conduit_container_labels_public_federation_api_enabled %}
############################################################
# #
# Public Federation-API (/_matrix) #
# #
############################################################
traefik.http.routers.matrix-conduit-public-federation-api.rule={{ matrix_conduit_container_labels_public_federation_api_traefik_rule }}
@ -107,10 +121,13 @@ traefik.http.routers.matrix-conduit-public-federation-api.tls={{ matrix_conduit_
traefik.http.routers.matrix-conduit-public-federation-api.tls.certResolver={{ matrix_conduit_container_labels_public_federation_api_traefik_tls_certResolver }}
{% endif %}
############################################################
# #
# /Public Federation-API (/_matrix) #
# #
############################################################
{% endif %}
{#
/Public Federation-API (/_matrix)
#}
{% endif %}