From 92c3122b96ce94fc9e8d4aaf387c64eff04318c1 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 15 Jan 2024 11:17:57 +0200 Subject: [PATCH] Add additional-networks support to matrix-dynamic-dns Not that it seems necessary right now, but it makes it consistent with all other roles. --- roles/custom/matrix-dynamic-dns/defaults/main.yml | 4 ++++ .../templates/systemd/matrix-dynamic-dns.service.j2 | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix-dynamic-dns/defaults/main.yml b/roles/custom/matrix-dynamic-dns/defaults/main.yml index ac4f533b9..72b0cfa29 100644 --- a/roles/custom/matrix-dynamic-dns/defaults/main.yml +++ b/roles/custom/matrix-dynamic-dns/defaults/main.yml @@ -20,6 +20,10 @@ matrix_dynamic_dns_docker_image_force_pull: "{{ matrix_dynamic_dns_docker_image. matrix_dynamic_dns_container_network: '' +matrix_dynamic_dns_container_additional_networks: "{{ matrix_dynamic_dns_container_additional_networks_auto + matrix_dynamic_dns_container_additional_networks_custom }}" +matrix_dynamic_dns_container_additional_networks_auto: [] +matrix_dynamic_dns_container_additional_networks_custom: [] + # List of extra arguments to pass to the ontainer mode matrix_dynamic_dns_container_extra_arguments: [] diff --git a/roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2 b/roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2 index 08cdb84f1..488c692ad 100644 --- a/roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2 +++ b/roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2 @@ -15,7 +15,10 @@ 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-dynamic-dns 2>/dev/null || true' ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-dynamic-dns 2>/dev/null || true' -ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-dynamic-dns \ + +ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ + --rm \ + --name=matrix-dynamic-dns \ --log-driver=none \ --network={{ matrix_dynamic_dns_container_network }} \ -e PUID={{ matrix_user_uid }} \ @@ -26,6 +29,13 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name {% endfor %} {{ matrix_dynamic_dns_docker_image }} + +{% for network in matrix_dynamic_dns_container_additional_networks %} +ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-dynamic-dns +{% endfor %} + +ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-dynamic-dns + 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-dynamic-dns 2>/dev/null || true' ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-dynamic-dns 2>/dev/null || true' Restart=always