cqrenet/matrix-docker-ansible-deploy
5
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-07-17 15:26:41 +00:00
Code Issues Wiki Activity

Rename matrix_heisenbridge_* variables to matrix_bridge_heisenbridge_*

Browse Source 
Part of adopting a uniform naming policy for bridge variables,
where the variable prefix matches the role directory name.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Slavi Pantaleev
2026-07-16 14:48:14 +03:00
parent 62b5375815
commit 6e4992a2fe
9 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-bridge-heisenbridge/templates/labels.j2
+14 -14
View File
@@ -4,33 +4,33 @@ SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if matrix_heisenbridge_container_labels_traefik_enabled %}
{% if matrix_bridge_heisenbridge_container_labels_traefik_enabled %}
traefik.enable=true
{% if matrix_heisenbridge_container_labels_traefik_docker_network %}
traefik.docker.network={{ matrix_heisenbridge_container_labels_traefik_docker_network }}
{% if matrix_bridge_heisenbridge_container_labels_traefik_docker_network %}
traefik.docker.network={{ matrix_bridge_heisenbridge_container_labels_traefik_docker_network }}
{% endif %}
traefik.http.services.matrix-heisenbridge.loadbalancer.server.port=9898
{% set middlewares = [] %}
{% if matrix_heisenbridge_container_labels_traefik_path_prefix != '/' %}
traefik.http.middlewares.matrix-heisenbridge-strip-prefix.stripprefix.prefixes={{ matrix_heisenbridge_container_labels_traefik_path_prefix }}
{% if matrix_bridge_heisenbridge_container_labels_traefik_path_prefix != '/' %}
traefik.http.middlewares.matrix-heisenbridge-strip-prefix.stripprefix.prefixes={{ matrix_bridge_heisenbridge_container_labels_traefik_path_prefix }}
{% set middlewares = middlewares + ['matrix-heisenbridge-strip-prefix'] %}
{% endif %}
{% if matrix_heisenbridge_container_labels_traefik_media_enabled %}
{% if matrix_bridge_heisenbridge_container_labels_traefik_media_enabled %}
##########################################################################
# #
# Media #
# #
##########################################################################
traefik.http.routers.matrix-heisenbridge-media.rule={{ matrix_heisenbridge_container_labels_traefik_media_rule }}
traefik.http.routers.matrix-heisenbridge-media.rule={{ matrix_bridge_heisenbridge_container_labels_traefik_media_rule }}
{% if matrix_heisenbridge_container_labels_traefik_media_priority | int > 0 %}
traefik.http.routers.matrix-heisenbridge-media.priority={{ matrix_heisenbridge_container_labels_traefik_media_priority }}
{% if matrix_bridge_heisenbridge_container_labels_traefik_media_priority | int > 0 %}
traefik.http.routers.matrix-heisenbridge-media.priority={{ matrix_bridge_heisenbridge_container_labels_traefik_media_priority }}
{% endif %}
{% if middlewares | length > 0 %}
@@ -38,11 +38,11 @@ traefik.http.routers.matrix-heisenbridge-media.middlewares={{ middlewares | join
{% endif %}
traefik.http.routers.matrix-heisenbridge-media.service=matrix-heisenbridge
traefik.http.routers.matrix-heisenbridge-media.entrypoints={{ matrix_heisenbridge_container_labels_traefik_entrypoints }}
traefik.http.routers.matrix-heisenbridge-media.entrypoints={{ matrix_bridge_heisenbridge_container_labels_traefik_entrypoints }}
traefik.http.routers.matrix-heisenbridge-media.tls={{ matrix_heisenbridge_container_labels_traefik_media_tls | to_json }}
{% if matrix_heisenbridge_container_labels_traefik_media_entrypoints %}
traefik.http.routers.matrix-heisenbridge-media.tls.certResolver={{ matrix_heisenbridge_container_labels_traefik_media_tls_certResolver }}
traefik.http.routers.matrix-heisenbridge-media.tls={{ matrix_bridge_heisenbridge_container_labels_traefik_media_tls | to_json }}
{% if matrix_bridge_heisenbridge_container_labels_traefik_media_entrypoints %}
traefik.http.routers.matrix-heisenbridge-media.tls.certResolver={{ matrix_bridge_heisenbridge_container_labels_traefik_media_tls_certResolver }}
{% endif %}
##########################################################################
@@ -55,4 +55,4 @@ traefik.http.routers.matrix-heisenbridge-media.tls.certResolver={{ matrix_heisen
{% endif %}
{{ matrix_heisenbridge_container_labels_additional_labels }}
{{ matrix_bridge_heisenbridge_container_labels_additional_labels }}
roles/custom/matrix-bridge-heisenbridge/templates/systemd/matrix-heisenbridge.service.j2
+16 -16
View File
@@ -1,11 +1,11 @@
#jinja2: lstrip_blocks: True
[Unit]
Description=a bouncer-style Matrix IRC bridge
{% for service in matrix_heisenbridge_systemd_required_services_list %}
{% for service in matrix_bridge_heisenbridge_systemd_required_services_list %}
Requires={{ service }}
After={{ service }}
{% endfor %}
{% for service in matrix_heisenbridge_systemd_wanted_services_list %}
{% for service in matrix_bridge_heisenbridge_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no
@@ -13,7 +13,7 @@ DefaultDependencies=no
[Service]
Type=simple
Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} stop -t {{ matrix_heisenbridge_container_stop_grace_time_seconds }} matrix-heisenbridge
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} stop -t {{ matrix_bridge_heisenbridge_container_stop_grace_time_seconds }} matrix-heisenbridge
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} rm matrix-heisenbridge
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
@@ -22,37 +22,37 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network={{ matrix_heisenbridge_container_network }} \
{% if matrix_heisenbridge_identd_enabled %}
--network={{ matrix_bridge_heisenbridge_container_network }} \
{% if matrix_bridge_heisenbridge_identd_enabled %}
-p 113:13113 \
{% endif %}
--mount type=bind,src={{ matrix_heisenbridge_base_path }},dst=/config \
--label-file={{ matrix_heisenbridge_base_path }}/labels \
{% for arg in matrix_heisenbridge_container_extra_arguments %}
--mount type=bind,src={{ matrix_bridge_heisenbridge_base_path }},dst=/config \
--label-file={{ matrix_bridge_heisenbridge_base_path }}/labels \
{% for arg in matrix_bridge_heisenbridge_container_extra_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_heisenbridge_container_image }} \
{% if matrix_heisenbridge_identd_enabled %}
{{ matrix_bridge_heisenbridge_container_image }} \
{% if matrix_bridge_heisenbridge_identd_enabled %}
--identd \
--identd-port 13113 \
{% endif %}
{% if matrix_heisenbridge_owner %}
-o {{ matrix_heisenbridge_owner }} \
{% if matrix_bridge_heisenbridge_owner %}
-o {{ matrix_bridge_heisenbridge_owner }} \
{% endif %}
--config /config/registration.yaml \
--listen-address 0.0.0.0 \
--listen-port 9898 \
{{ matrix_heisenbridge_homeserver_url }}
{{ matrix_bridge_heisenbridge_homeserver_url }}
{% if matrix_heisenbridge_container_network != 'host' %}
{% for network in matrix_heisenbridge_container_additional_networks %}
{% if matrix_bridge_heisenbridge_container_network != 'host' %}
{% for network in matrix_bridge_heisenbridge_container_additional_networks %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-heisenbridge
{% endfor %}
{% endif %}
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-heisenbridge
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} stop -t {{ matrix_heisenbridge_container_stop_grace_time_seconds }} matrix-heisenbridge
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} stop -t {{ matrix_bridge_heisenbridge_container_stop_grace_time_seconds }} matrix-heisenbridge
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} rm matrix-heisenbridge
Restart=always
RestartSec=30