From 51df34e7ae3fbf2a500a10cfdf85f34b31bcfad6 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 17 Jan 2024 17:56:45 +0200 Subject: [PATCH] Ensure each container labels file defines at least one service Most of these files were defining a service, usually toward the end. These lines have been moved upward. Some components (mautrix-signal, mautrix-gmessages, etc.) were defining a service conditionally (only if metrics are exposed, etc). This was causing issues like these in the Traefik logs: > level=error msg="service \"matrix-mautrix-twitter\" error: port is missing" providerName=docker container=matrix-mautrix-twitter-.. --- .../matrix-bot-buscarron/templates/labels.j2 | 3 ++- .../custom/matrix-bot-go-neb/templates/labels.j2 | 3 ++- .../matrix-bot-honoroit/templates/labels.j2 | 3 ++- .../matrix-bridge-hookshot/templates/labels.j2 | 16 ++++++---------- .../templates/labels.j2 | 7 +++---- .../templates/labels.j2 | 4 ++-- .../templates/labels.j2 | 7 +++---- .../templates/labels.j2 | 7 +++---- .../templates/labels.j2 | 4 ++-- .../templates/labels.j2 | 4 ++-- .../templates/labels.j2 | 4 ++-- .../templates/labels.j2 | 4 ++-- .../templates/labels.j2 | 4 ++-- .../templates/labels.j2 | 3 ++- .../templates/labels.j2 | 4 ++-- .../matrix-client-cinny/templates/labels.j2 | 3 ++- .../matrix-client-element/templates/labels.j2 | 3 ++- .../matrix-client-hydrogen/templates/labels.j2 | 3 ++- .../templates/labels.j2 | 3 ++- roles/custom/matrix-corporal/templates/labels.j2 | 6 ++---- .../custom/matrix-dimension/templates/labels.j2 | 3 ++- .../custom/matrix-rageshake/templates/labels.j2 | 3 ++- .../matrix-sliding-sync/templates/labels.j2 | 3 ++- roles/custom/matrix-sygnal/templates/labels.j2 | 3 ++- .../matrix-synapse-admin/templates/labels.j2 | 3 ++- 25 files changed, 57 insertions(+), 53 deletions(-) diff --git a/roles/custom/matrix-bot-buscarron/templates/labels.j2 b/roles/custom/matrix-bot-buscarron/templates/labels.j2 index 9150a44bf..b5f020a17 100644 --- a/roles/custom/matrix-bot-buscarron/templates/labels.j2 +++ b/roles/custom/matrix-bot-buscarron/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_bot_buscarron_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-bot-buscarron.loadbalancer.server.port=8080 + {% set middlewares = [] %} {% set middlewares_metrics = [] %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-bot-buscarron.tls={{ matrix_bot_buscarron_container_ {% if matrix_bot_buscarron_container_labels_traefik_tls %} traefik.http.routers.matrix-bot-buscarron.tls.certResolver={{ matrix_bot_buscarron_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-bot-buscarron.loadbalancer.server.port=8080 {% endif %} diff --git a/roles/custom/matrix-bot-go-neb/templates/labels.j2 b/roles/custom/matrix-bot-go-neb/templates/labels.j2 index 54aa25835..1f0123add 100644 --- a/roles/custom/matrix-bot-go-neb/templates/labels.j2 +++ b/roles/custom/matrix-bot-go-neb/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_bot_go_neb_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-bot-go-neb.loadbalancer.server.port=4050 + {% set middlewares = [] %} {% if matrix_bot_go_neb_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-bot-go-neb.tls={{ matrix_bot_go_neb_container_labels traefik.http.routers.matrix-bot-go-neb.tls.certResolver={{ matrix_bot_go_neb_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-bot-go-neb.loadbalancer.server.port=4050 {% endif %} {{ matrix_bot_go_neb_container_labels_additional_labels }} diff --git a/roles/custom/matrix-bot-honoroit/templates/labels.j2 b/roles/custom/matrix-bot-honoroit/templates/labels.j2 index 8e20ea459..ef210c49d 100644 --- a/roles/custom/matrix-bot-honoroit/templates/labels.j2 +++ b/roles/custom/matrix-bot-honoroit/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_bot_honoroit_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-bot-honoroit-metrics.loadbalancer.server.port=8080 + {% set middlewares = [] %} {% set middlewares_metrics = [] %} @@ -43,7 +45,6 @@ traefik.http.routers.matrix-bot-honoroit-metrics.tls={{ matrix_bot_honoroit_cont {% if matrix_bot_honoroit_container_labels_traefik_tls %} traefik.http.routers.matrix-bot-honoroit-metrics.tls.certResolver={{ matrix_bot_honoroit_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-bot-honoroit-metrics.loadbalancer.server.port=8080 {% endif %} {% endif %} diff --git a/roles/custom/matrix-bridge-hookshot/templates/labels.j2 b/roles/custom/matrix-bridge-hookshot/templates/labels.j2 index 35d47b9fd..07f015723 100644 --- a/roles/custom/matrix-bridge-hookshot/templates/labels.j2 +++ b/roles/custom/matrix-bridge-hookshot/templates/labels.j2 @@ -5,6 +5,12 @@ traefik.enable=true traefik.docker.network={{ matrix_hookshot_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-hookshot-webhooks.loadbalancer.server.port={{ matrix_hookshot_webhook_port }} +traefik.http.services.matrix-hookshot-appservice.loadbalancer.server.port={{ matrix_hookshot_appservice_port }} +traefik.http.services.matrix-hookshot-widgets.loadbalancer.server.port={{ matrix_hookshot_widgets_port }} +traefik.http.services.matrix-hookshot-provisioning.loadbalancer.server.port={{ matrix_hookshot_provisioning_port }} +traefik.http.services.matrix-hookshot-metrics.loadbalancer.server.port={{ matrix_hookshot_metrics_port }} + {% if matrix_hookshot_container_labels_webhooks_enabled %} ############################################################ # # @@ -12,8 +18,6 @@ traefik.docker.network={{ matrix_hookshot_container_labels_traefik_docker_networ # # ############################################################ -traefik.http.services.matrix-hookshot-webhooks.loadbalancer.server.port={{ matrix_hookshot_webhook_port }} - traefik.http.middlewares.matrix-hookshot-webhooks-strip-prefix.stripprefix.prefixes={{ matrix_hookshot_webhook_endpoint }} traefik.http.routers.matrix-hookshot-webhooks.rule={{ matrix_hookshot_container_labels_webhooks_traefik_rule }} @@ -47,8 +51,6 @@ traefik.http.routers.matrix-hookshot-webhooks.tls.certResolver={{ matrix_hooksho # # ############################################################ -traefik.http.services.matrix-hookshot-appservice.loadbalancer.server.port={{ matrix_hookshot_appservice_port }} - traefik.http.middlewares.matrix-hookshot-appservice-strip-prefix.stripprefix.prefixes={{ matrix_hookshot_appservice_endpoint }} traefik.http.routers.matrix-hookshot-appservice.rule={{ matrix_hookshot_container_labels_appservice_traefik_rule }} @@ -81,8 +83,6 @@ traefik.http.routers.matrix-hookshot-appservice.tls.certResolver={{ matrix_hooks # # ############################################################ -traefik.http.services.matrix-hookshot-widgets.loadbalancer.server.port={{ matrix_hookshot_widgets_port }} - traefik.http.middlewares.matrix-hookshot-widgets-strip-prefix.stripprefix.prefixes={{ matrix_hookshot_widgets_endpoint }} traefik.http.routers.matrix-hookshot-widgets.rule={{ matrix_hookshot_container_labels_widgets_traefik_rule }} @@ -114,8 +114,6 @@ traefik.http.routers.matrix-hookshot-widgets.tls.certResolver={{ matrix_hookshot # # ############################################################ -traefik.http.services.matrix-hookshot-provisioning.loadbalancer.server.port={{ matrix_hookshot_provisioning_port }} - traefik.http.middlewares.matrix-hookshot-provisioning-strip-prefix.stripprefix.prefixes={{ matrix_hookshot_provisioning_endpoint }} traefik.http.routers.matrix-hookshot-provisioning.rule={{ matrix_hookshot_container_labels_provisioning_traefik_rule }} @@ -148,8 +146,6 @@ traefik.http.routers.matrix-hookshot-provisioning.tls.certResolver={{ matrix_hoo # # ############################################################ -traefik.http.services.matrix-hookshot-metrics.loadbalancer.server.port={{ matrix_hookshot_metrics_port }} - {% set metricsMiddlewares = ['matrix-hookshot-metrics-replace-path'] %} traefik.http.middlewares.matrix-hookshot-metrics-replace-path.replacepath.path=/metrics diff --git a/roles/custom/matrix-bridge-mautrix-facebook/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-facebook/templates/labels.j2 index a1cce4e45..d71e7eed2 100644 --- a/roles/custom/matrix-bridge-mautrix-facebook/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-facebook/templates/labels.j2 @@ -5,6 +5,9 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_facebook_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-facebook-appservice.loadbalancer.server.port=29319 +traefik.http.services.matrix-mautrix-facebook-metrics.loadbalancer.server.port=8000 + {% if matrix_mautrix_facebook_container_labels_public_endpoint_enabled %} ############################################################ # # @@ -12,8 +15,6 @@ traefik.docker.network={{ matrix_mautrix_facebook_container_labels_traefik_docke # # ############################################################ -traefik.http.services.matrix-mautrix-facebook-appservice.loadbalancer.server.port=29319 - traefik.http.routers.matrix-mautrix-facebook-public.rule={{ matrix_mautrix_facebook_container_labels_public_endpoint_traefik_rule }} {% if matrix_mautrix_facebook_container_labels_public_endpoint_traefik_priority | int > 0 %} @@ -43,8 +44,6 @@ traefik.http.routers.matrix-mautrix-facebook-public.tls.certResolver={{ matrix_m # # ############################################################ -traefik.http.services.matrix-mautrix-facebook-metrics.loadbalancer.server.port=8000 - {% if matrix_mautrix_facebook_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-facebook-metrics-basic-auth.basicauth.users={{ matrix_mautrix_facebook_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-facebook-metrics.middlewares=matrix-mautrix-facebook-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-gmessages/templates/labels.j2 index f960ef01e..1beea2c1c 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-gmessages/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_gmessages_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-gmessages-metrics.loadbalancer.server.port=8001 + {% if matrix_mautrix_gmessages_container_labels_metrics_enabled %} ############################################################ # # @@ -12,8 +14,6 @@ traefik.docker.network={{ matrix_mautrix_gmessages_container_labels_traefik_dock # # ############################################################ -traefik.http.services.matrix-mautrix-gmessages-metrics.loadbalancer.server.port=8001 - {% if matrix_mautrix_gmessages_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-gmessages-metrics-basic-auth.basicauth.users={{ matrix_mautrix_gmessages_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-gmessages-metrics.middlewares=matrix-mautrix-gmessages-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-googlechat/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-googlechat/templates/labels.j2 index d43bb1ad8..8f35f5c51 100644 --- a/roles/custom/matrix-bridge-mautrix-googlechat/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-googlechat/templates/labels.j2 @@ -5,6 +5,9 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_googlechat_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-googlechat-public.loadbalancer.server.port=8080 +traefik.http.services.matrix-mautrix-googlechat-metrics.loadbalancer.server.port=8000 + {% if matrix_mautrix_googlechat_container_labels_public_endpoint_enabled %} ############################################################ # # @@ -12,8 +15,6 @@ traefik.docker.network={{ matrix_mautrix_googlechat_container_labels_traefik_doc # # ############################################################ -traefik.http.services.matrix-mautrix-googlechat-public.loadbalancer.server.port=8080 - traefik.http.routers.matrix-mautrix-googlechat-public.rule={{ matrix_mautrix_googlechat_container_labels_public_endpoint_traefik_rule }} {% if matrix_mautrix_googlechat_container_labels_public_endpoint_traefik_priority | int > 0 %} @@ -43,8 +44,6 @@ traefik.http.routers.matrix-mautrix-googlechat-public.tls.certResolver={{ matrix # # ############################################################ -traefik.http.services.matrix-mautrix-googlechat-metrics.loadbalancer.server.port=8000 - {% if matrix_mautrix_googlechat_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-googlechat-metrics-basic-auth.basicauth.users={{ matrix_mautrix_googlechat_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-googlechat-metrics.middlewares=matrix-mautrix-googlechat-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-hangouts/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-hangouts/templates/labels.j2 index b5e561fdf..31dd03e2d 100644 --- a/roles/custom/matrix-bridge-mautrix-hangouts/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-hangouts/templates/labels.j2 @@ -5,6 +5,9 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_hangouts_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-hangouts-public.loadbalancer.server.port=8080 +traefik.http.services.matrix-mautrix-hangouts-metrics.loadbalancer.server.port=8000 + {% if matrix_mautrix_hangouts_container_labels_public_endpoint_enabled %} ############################################################ # # @@ -12,8 +15,6 @@ traefik.docker.network={{ matrix_mautrix_hangouts_container_labels_traefik_docke # # ############################################################ -traefik.http.services.matrix-mautrix-hangouts-public.loadbalancer.server.port=8080 - traefik.http.routers.matrix-mautrix-hangouts-public.rule={{ matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_rule }} {% if matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_priority | int > 0 %} @@ -43,8 +44,6 @@ traefik.http.routers.matrix-mautrix-hangouts-public.tls.certResolver={{ matrix_m # # ############################################################ -traefik.http.services.matrix-mautrix-hangouts-metrics.loadbalancer.server.port=8000 - {% if matrix_mautrix_hangouts_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-hangouts-metrics-basic-auth.basicauth.users={{ matrix_mautrix_hangouts_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-hangouts-metrics.middlewares=matrix-mautrix-hangouts-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-instagram/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-instagram/templates/labels.j2 index e05a2162b..c67f2264d 100644 --- a/roles/custom/matrix-bridge-mautrix-instagram/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-instagram/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_instagram_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-instagram-metrics.loadbalancer.server.port=8000 + {% if matrix_mautrix_instagram_container_labels_metrics_enabled %} ############################################################ # # @@ -12,8 +14,6 @@ traefik.docker.network={{ matrix_mautrix_instagram_container_labels_traefik_dock # # ############################################################ -traefik.http.services.matrix-mautrix-instagram-metrics.loadbalancer.server.port=8000 - {% if matrix_mautrix_instagram_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-instagram-metrics-basic-auth.basicauth.users={{ matrix_mautrix_instagram_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-instagram-metrics.middlewares=matrix-mautrix-instagram-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-signal/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-signal/templates/labels.j2 index cbc35ed36..fb912080a 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-signal/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_signal_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-signal-metrics.loadbalancer.server.port=8000 + {% if matrix_mautrix_signal_container_labels_metrics_enabled %} ############################################################ # # @@ -12,8 +14,6 @@ traefik.docker.network={{ matrix_mautrix_signal_container_labels_traefik_docker_ # # ############################################################ -traefik.http.services.matrix-mautrix-signal-metrics.loadbalancer.server.port=8000 - {% if matrix_mautrix_signal_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-signal-metrics-basic-auth.basicauth.users={{ matrix_mautrix_signal_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-signal-metrics.middlewares=matrix-mautrix-signal-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-twitter/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-twitter/templates/labels.j2 index 15018362f..e54502e74 100644 --- a/roles/custom/matrix-bridge-mautrix-twitter/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-twitter/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_twitter_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-twitter-metrics.loadbalancer.server.port=8000 + {% if matrix_mautrix_twitter_container_labels_metrics_enabled %} ############################################################ # # @@ -12,8 +14,6 @@ traefik.docker.network={{ matrix_mautrix_twitter_container_labels_traefik_docker # # ############################################################ -traefik.http.services.matrix-mautrix-twitter-metrics.loadbalancer.server.port=8000 - {% if matrix_mautrix_twitter_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-twitter-metrics-basic-auth.basicauth.users={{ matrix_mautrix_twitter_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-twitter-metrics.middlewares=matrix-mautrix-twitter-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/labels.j2 index 1483f9305..23f94361e 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_mautrix_whatsapp_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mautrix-whatsapp-metrics.loadbalancer.server.port=8001 + {% if matrix_mautrix_whatsapp_container_labels_metrics_enabled %} ############################################################ # # @@ -12,8 +14,6 @@ traefik.docker.network={{ matrix_mautrix_whatsapp_container_labels_traefik_docke # # ############################################################ -traefik.http.services.matrix-mautrix-whatsapp-metrics.loadbalancer.server.port=8001 - {% if matrix_mautrix_whatsapp_container_labels_metrics_middleware_basic_auth_enabled %} traefik.http.middlewares.matrix-mautrix-whatsapp-metrics-basic-auth.basicauth.users={{ matrix_mautrix_whatsapp_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-whatsapp-metrics.middlewares=matrix-mautrix-whatsapp-metrics-basic-auth diff --git a/roles/custom/matrix-bridge-mx-puppet-slack/templates/labels.j2 b/roles/custom/matrix-bridge-mx-puppet-slack/templates/labels.j2 index 5f24230d3..aec01387f 100644 --- a/roles/custom/matrix-bridge-mx-puppet-slack/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mx-puppet-slack/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_mx_puppet_slack_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-mx-puppet-slack.loadbalancer.server.port={{ matrix_mx_puppet_slack_appservice_address }} + {% if matrix_mx_puppet_slack_container_labels_public_endpoint_enabled %} ############################################################ # # @@ -12,8 +14,6 @@ traefik.docker.network={{ matrix_mx_puppet_slack_container_labels_traefik_docker # # ############################################################ -traefik.http.services.matrix-mx-puppet-slack.loadbalancer.server.port={{ matrix_mx_puppet_slack_appservice_address }} - traefik.http.routers.matrix-mx-puppet-slack-public.rule={{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_rule }} {% if matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_priority | int > 0 %} diff --git a/roles/custom/matrix-bridge-mx-puppet-twitter/templates/labels.j2 b/roles/custom/matrix-bridge-mx-puppet-twitter/templates/labels.j2 index 1c20ab174..9aef5fe0d 100644 --- a/roles/custom/matrix-bridge-mx-puppet-twitter/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mx-puppet-twitter/templates/labels.j2 @@ -5,13 +5,14 @@ traefik.enable=true traefik.docker.network={{ matrix_mx_puppet_twitter_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.martix-mx-puppet-twitter.loadbalancer.server.port={{ matrix_mx_puppet_twitter_appservice_port }} + {% if matrix_mx_puppet_twitter_container_labels_public_endpoint_enabled %} ############################################################ # # # Public # # # ############################################################ -traefik.http.services.martix-mx-puppet-twitter.loadbalancer.server.port={{ matrix_mx_puppet_twitter_appservice_port }} traefik.http.routers.matrix-mx-puppet-twitter-public.rule={{ matrix_mx_puppet_twitter_container_labels_public_endpoint_traefik_rule }} diff --git a/roles/custom/matrix-cactus-comments-client/templates/labels.j2 b/roles/custom/matrix-cactus-comments-client/templates/labels.j2 index 83c140ca7..274ba9e07 100644 --- a/roles/custom/matrix-cactus-comments-client/templates/labels.j2 +++ b/roles/custom/matrix-cactus-comments-client/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_cactus_comments_client_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-cactus-comments-client.loadbalancer.server.port={{ matrix_cactus_comments_client_environment_variable_server_port }} + {% if matrix_cactus_comments_client_container_labels_public_enabled %} ############################################################ @@ -13,8 +15,6 @@ traefik.docker.network={{ matrix_cactus_comments_client_container_labels_traefik # # ############################################################ -traefik.http.services.matrix-cactus-comments-client.loadbalancer.server.port={{ matrix_cactus_comments_client_environment_variable_server_port }} - {% set public_middlewares = [] %} {% if matrix_cactus_comments_client_container_labels_public_traefik_path_prefix != '/' %} diff --git a/roles/custom/matrix-client-cinny/templates/labels.j2 b/roles/custom/matrix-client-cinny/templates/labels.j2 index f1c4f49ad..ede967226 100644 --- a/roles/custom/matrix-client-cinny/templates/labels.j2 +++ b/roles/custom/matrix-client-cinny/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_client_cinny_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-client-cinny.loadbalancer.server.port=8080 + {% set middlewares = [] %} {% if matrix_client_cinny_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-client-cinny.tls={{ matrix_client_cinny_container_la traefik.http.routers.matrix-client-cinny.tls.certResolver={{ matrix_client_cinny_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-client-cinny.loadbalancer.server.port=8080 {% endif %} {{ matrix_client_cinny_container_labels_additional_labels }} diff --git a/roles/custom/matrix-client-element/templates/labels.j2 b/roles/custom/matrix-client-element/templates/labels.j2 index de67299e2..8de199918 100644 --- a/roles/custom/matrix-client-element/templates/labels.j2 +++ b/roles/custom/matrix-client-element/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_client_element_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-client-element.loadbalancer.server.port=8080 + {% set middlewares = [] %} {% if matrix_client_element_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-client-element.tls={{ matrix_client_element_containe traefik.http.routers.matrix-client-element.tls.certResolver={{ matrix_client_element_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-client-element.loadbalancer.server.port=8080 {% endif %} {{ matrix_client_element_container_labels_additional_labels }} diff --git a/roles/custom/matrix-client-hydrogen/templates/labels.j2 b/roles/custom/matrix-client-hydrogen/templates/labels.j2 index 71c3ca59e..f5ccf8c97 100644 --- a/roles/custom/matrix-client-hydrogen/templates/labels.j2 +++ b/roles/custom/matrix-client-hydrogen/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_client_hydrogen_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-client-hydrogen.loadbalancer.server.port=8080 + {% set middlewares = [] %} {% if matrix_client_hydrogen_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-client-hydrogen.tls={{ matrix_client_hydrogen_contai traefik.http.routers.matrix-client-hydrogen.tls.certResolver={{ matrix_client_hydrogen_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-client-hydrogen.loadbalancer.server.port=8080 {% endif %} {{ matrix_client_hydrogen_container_labels_additional_labels }} diff --git a/roles/custom/matrix-client-schildichat/templates/labels.j2 b/roles/custom/matrix-client-schildichat/templates/labels.j2 index 85e279821..25f19f6b4 100644 --- a/roles/custom/matrix-client-schildichat/templates/labels.j2 +++ b/roles/custom/matrix-client-schildichat/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_client_schildichat_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-client-schildichat.loadbalancer.server.port=8080 + {% set middlewares = [] %} {% if matrix_client_schildichat_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-client-schildichat.tls={{ matrix_client_schildichat_ traefik.http.routers.matrix-client-schildichat.tls.certResolver={{ matrix_client_schildichat_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-client-schildichat.loadbalancer.server.port=8080 {% endif %} {{ matrix_client_schildichat_container_labels_additional_labels }} diff --git a/roles/custom/matrix-corporal/templates/labels.j2 b/roles/custom/matrix-corporal/templates/labels.j2 index 7b650edee..e28fd7761 100644 --- a/roles/custom/matrix-corporal/templates/labels.j2 +++ b/roles/custom/matrix-corporal/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_corporal_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-corporal-api.loadbalancer.server.port=41081 +traefik.http.services.matrix-corporal-gateway.loadbalancer.server.port=41080 {% if matrix_corporal_container_labels_api_enabled %} ############################################################ @@ -13,8 +15,6 @@ traefik.docker.network={{ matrix_corporal_container_labels_traefik_docker_networ # # ############################################################ -traefik.http.services.matrix-corporal-api.loadbalancer.server.port=41081 - traefik.http.routers.matrix-corporal-api.rule={{ matrix_corporal_container_labels_api_traefik_rule }} {% if matrix_corporal_container_labels_api_traefik_priority | int > 0 %} @@ -44,8 +44,6 @@ traefik.http.routers.matrix-corporal-api.tls.certResolver={{ matrix_corporal_con # # ############################################################ -traefik.http.services.matrix-corporal-gateway.loadbalancer.server.port=41080 - traefik.http.routers.matrix-corporal-matrix-client-api.rule={{ matrix_corporal_container_labels_matrix_client_api_traefik_rule }} {% if matrix_corporal_container_labels_matrix_client_api_traefik_priority | int > 0 %} diff --git a/roles/custom/matrix-dimension/templates/labels.j2 b/roles/custom/matrix-dimension/templates/labels.j2 index 24b570cbb..09ad07b96 100644 --- a/roles/custom/matrix-dimension/templates/labels.j2 +++ b/roles/custom/matrix-dimension/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_dimension_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-dimension.loadbalancer.server.port=8184 + {% set middlewares = [] %} {% if matrix_dimension_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-dimension.tls={{ matrix_dimension_container_labels_t traefik.http.routers.matrix-dimension.tls.certResolver={{ matrix_dimension_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-dimension.loadbalancer.server.port=8184 {% endif %} {{ matrix_dimension_container_labels_additional_labels }} diff --git a/roles/custom/matrix-rageshake/templates/labels.j2 b/roles/custom/matrix-rageshake/templates/labels.j2 index cdaf5f6af..626c2fb7c 100644 --- a/roles/custom/matrix-rageshake/templates/labels.j2 +++ b/roles/custom/matrix-rageshake/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_rageshake_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-rageshake.loadbalancer.server.port=9110 + {% set middlewares = [] %} {% if matrix_rageshake_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-rageshake.tls={{ matrix_rageshake_container_labels_t traefik.http.routers.matrix-rageshake.tls.certResolver={{ matrix_rageshake_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-rageshake.loadbalancer.server.port=9110 {% endif %} {{ matrix_rageshake_container_labels_additional_labels }} diff --git a/roles/custom/matrix-sliding-sync/templates/labels.j2 b/roles/custom/matrix-sliding-sync/templates/labels.j2 index 665492499..aecc5a8a9 100644 --- a/roles/custom/matrix-sliding-sync/templates/labels.j2 +++ b/roles/custom/matrix-sliding-sync/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_sliding_sync_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-sliding-sync.loadbalancer.server.port=8008 + {% set middlewares = [] %} {% if matrix_sliding_sync_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-sliding-sync.tls={{ matrix_sliding_sync_container_la traefik.http.routers.matrix-sliding-sync.tls.certResolver={{ matrix_sliding_sync_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-sliding-sync.loadbalancer.server.port=8008 {% endif %} {{ matrix_sliding_sync_container_labels_additional_labels }} diff --git a/roles/custom/matrix-sygnal/templates/labels.j2 b/roles/custom/matrix-sygnal/templates/labels.j2 index 964805894..3ef6731c3 100644 --- a/roles/custom/matrix-sygnal/templates/labels.j2 +++ b/roles/custom/matrix-sygnal/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_sygnal_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-sygnal.loadbalancer.server.port=6000 + {% set middlewares = [] %} {% if matrix_sygnal_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-sygnal.tls={{ matrix_sygnal_container_labels_traefik traefik.http.routers.matrix-sygnal.tls.certResolver={{ matrix_sygnal_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-sygnal.loadbalancer.server.port=6000 {% endif %} {{ matrix_sygnal_container_labels_additional_labels }} diff --git a/roles/custom/matrix-synapse-admin/templates/labels.j2 b/roles/custom/matrix-synapse-admin/templates/labels.j2 index 946fd6c98..b4e973e00 100644 --- a/roles/custom/matrix-synapse-admin/templates/labels.j2 +++ b/roles/custom/matrix-synapse-admin/templates/labels.j2 @@ -5,6 +5,8 @@ traefik.enable=true traefik.docker.network={{ matrix_synapse_admin_container_labels_traefik_docker_network }} {% endif %} +traefik.http.services.matrix-synapse-admin.loadbalancer.server.port=80 + {% set middlewares = [] %} {% if matrix_synapse_admin_container_labels_traefik_path_prefix != '/' %} @@ -39,7 +41,6 @@ traefik.http.routers.matrix-synapse-admin.tls={{ matrix_synapse_admin_container_ traefik.http.routers.matrix-synapse-admin.tls.certResolver={{ matrix_synapse_admin_container_labels_traefik_tls_certResolver }} {% endif %} -traefik.http.services.matrix-synapse-admin.loadbalancer.server.port=80 {% endif %} {{ matrix_synapse_admin_container_labels_additional_labels }}