Move matrix-bridge-mautrix-hangouts to its own container network

roles/custom/matrix-bridge-mautrix-hangouts/templates/config.yaml.j2

@@ -42,6 +42,11 @@ appservice:
     as_token: "{{ matrix_mautrix_hangouts_appservice_token }}"
     hs_token: "{{ matrix_mautrix_hangouts_homeserver_token }}"
 
+# Prometheus telemetry config. Requires prometheus-client to be installed.
+metrics:
+    enabled: {{ matrix_mautrix_hangouts_metrics_enabled | to_json }}
+    listen_port: 8000
+
 # Bridge config
 bridge:
     # Localpart template of MXIDs for Hangouts users.

roles/custom/matrix-bridge-mautrix-hangouts/templates/labels.j2

@@ -0,0 +1,55 @@
+{% if matrix_mautrix_hangouts_container_labels_traefik_enabled %}
+traefik.enable=true
+
+{% if matrix_mautrix_hangouts_container_labels_traefik_docker_network %}
+traefik.docker.network={{ matrix_mautrix_hangouts_container_labels_traefik_docker_network }}
+{% endif %}
+
+{#
+	Public
+#}
+{% if matrix_mautrix_hangouts_container_labels_public_endpoint_enabled %}
+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 %}
+traefik.http.routers.matrix-mautrix-hangouts-public.priority={{ matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_priority }}
+{% endif %}
+traefik.http.routers.matrix-mautrix-hangouts-public.service=matrix-mautrix-hangouts-public
+traefik.http.routers.matrix-mautrix-hangouts-public.entrypoints={{ matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_entrypoints }}
+traefik.http.routers.matrix-mautrix-hangouts-public.tls={{ matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_tls | to_json }}
+{% if matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_tls %}
+traefik.http.routers.matrix-mautrix-hangouts-public.tls.certResolver={{ matrix_mautrix_hangouts_container_labels_public_endpoint_traefik_tls_certResolver }}
+{% endif %}
+traefik.http.services.matrix-mautrix-hangouts-public.loadbalancer.server.port=8080
+{% endif %}
+{#
+	/Public
+#}
+
+{#
+	Metrics
+#}
+{% if matrix_mautrix_hangouts_container_labels_metrics_enabled %}
+traefik.http.routers.matrix-mautrix-hangouts-metrics.rule={{ matrix_mautrix_hangouts_container_labels_metrics_traefik_rule }}
+{% if matrix_mautrix_hangouts_container_labels_metrics_traefik_priority | int > 0 %}
+traefik.http.routers.matrix-mautrix-hangouts-metrics.priority={{ matrix_mautrix_hangouts_container_labels_metrics_traefik_priority }}
+{% endif %}
+traefik.http.routers.matrix-mautrix-hangouts-metrics.service=matrix-mautrix-hangouts-metrics
+traefik.http.routers.matrix-mautrix-hangouts-metrics.entrypoints={{ matrix_mautrix_hangouts_container_labels_metrics_traefik_entrypoints }}
+traefik.http.routers.matrix-mautrix-hangouts-metrics.tls={{ matrix_mautrix_hangouts_container_labels_metrics_traefik_tls | to_json }}
+{% if matrix_mautrix_hangouts_container_labels_metrics_traefik_tls %}
+traefik.http.routers.matrix-mautrix-hangouts-metrics.tls.certResolver={{ matrix_mautrix_hangouts_container_labels_metrics_traefik_tls_certResolver }}
+{% endif %}
+{% if matrix_mautrix_hangouts_container_labels_metrics_middleware_basic_auth_enabled %}
+traefik.http.routers.matrix-mautrix-hangouts-metrics.middlewares=matrix-mautrix-hangouts-metrics-basic-auth
+traefik.http.middlewares.matrix-mautrix-hangouts-metrics-basic-auth.basicauth.users={{ matrix_mautrix_hangouts_container_labels_metrics_middleware_basic_auth_users }}
+{% endif %}
+
+traefik.http.services.matrix-mautrix-hangouts-metrics.loadbalancer.server.port=8000
+{% endif %}
+{#
+	/Metrics
+#}
+
+{% endif %}
+
+{{ matrix_mautrix_hangouts_container_labels_additional_labels }}

roles/custom/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2

@@ -15,35 +15,46 @@ Type=simple
 Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mautrix-hangouts matrix-mautrix-hangouts-db 2>/dev/null || true'
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mautrix-hangouts matrix-mautrix-hangouts-db 2>/dev/null || true'
-ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-mautrix-hangouts-db \
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} run \
+			--rm \
+			--name=matrix-mautrix-hangouts-db \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
-			--network={{ matrix_docker_network }} \
-			-v {{ matrix_mautrix_hangouts_config_path }}:/config:z \
-			-v {{ matrix_mautrix_hangouts_data_path }}:/data:z \
+			--network={{ matrix_mautrix_hangouts_container_network }} \
+			--mount type=bind,src={{ matrix_mautrix_hangouts_config_path }},dst=/config \
+			--mount type=bind,src={{ matrix_mautrix_hangouts_data_path }},dst=/data \
 			{{ matrix_mautrix_hangouts_docker_image }} \
 			alembic -x config=/config/config.yaml upgrade head
 
 # Intentional delay, so that the homeserver (we likely depend on) can manage to start.
 ExecStartPre={{ matrix_host_command_sleep }} 5
 
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-mautrix-hangouts \
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
+			--rm \
+			--name=matrix-mautrix-hangouts \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
-			--network={{ matrix_docker_network }} \
+			--network={{ matrix_mautrix_hangouts_container_network }} \
 			{% if matrix_mautrix_hangouts_container_http_host_bind_port %}
 			-p {{ matrix_mautrix_hangouts_container_http_host_bind_port }}:8080 \
 			{% endif %}
-			-v {{ matrix_mautrix_hangouts_config_path }}:/config:z \
-			-v {{ matrix_mautrix_hangouts_data_path }}:/data:z \
+			--mount type=bind,src={{ matrix_mautrix_hangouts_config_path }},dst=/config \
+			--mount type=bind,src={{ matrix_mautrix_hangouts_data_path }},dst=/data \
+			--label-file={{ matrix_mautrix_hangouts_base_path }}/labels \
 			{% for arg in matrix_mautrix_hangouts_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
 			{{ matrix_mautrix_hangouts_docker_image }} \
 			python3 -m mautrix_hangouts -c /config/config.yaml --no-update
 
+{% for network in matrix_mautrix_hangouts_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-hangouts
+{% endfor %}
+
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-mautrix-hangouts
+
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mautrix-hangouts 2>/dev/null || true'
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mautrix-hangouts 2>/dev/null || true'
 Restart=always