Procházet zdrojové kódy

Add Jinja loop to allow adding multiple networks

pull/3042/head
Joshua Hoffmann před 2 roky
rodič
revize
e5d34002fd
1 změnil soubory, kde provedl 9 přidání a 10 odebrání
  1. +9
    -10
      roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2

+ 9
- 10
roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2 Zobrazit soubor

@@ -13,14 +13,13 @@ DefaultDependencies=no
[Service]
Type=simple
Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} kill {{ matrix_hookshot_container_url }}
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_container_url }}
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} kill {{ matrix_hookshot_container_ident }}
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_container_ident }}

ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm --name {{ matrix_hookshot_container_url }} \
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm --name {{ matrix_hookshot_container_ident }} \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network={{ matrix_hookshot_container_network }} \
--mount type=bind,src={{ matrix_hookshot_base_path }},dst=/data \
{% for port in matrix_hookshot_container_http_host_bind_ports %}
-p {{ port }} \
@@ -30,17 +29,17 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm -
{% endfor %}
{{ matrix_hookshot_docker_image }}

{% if matrix_hookshot_experimental_encryption_enabled %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect matrix-redis {{ matrix_hookshot_container_url }}
{% if matrix_hookshot_container_additional_networks %}
{% for network in matrix_hookshot_container_additional_networks %}ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network ]] {{ matrix_hookshot_container_ident }}{% endfor %}
{% endif %}

ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach {{ matrix_hookshot_container_url }}
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach {{ matrix_hookshot_container_ident }}

ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} kill {{ matrix_hookshot_container_url }}
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_container_url }}
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} kill {{ matrix_hookshot_container_ident }}
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_container_ident }}
Restart=always
RestartSec=30
SyslogIdentifier={{ matrix_hookshot_container_url }}
SyslogIdentifier={{ matrix_hookshot_container_ident }}

[Install]
WantedBy=multi-user.target

Načítá se…
Zrušit
Uložit