Преглед изворни кода

Merge pull request #3128 from FSG-Cat/Draupnir-Mjolnir-Explicit-Config-Declare

Resolve #2296 by Explicitly telling Draupnir and Mjolnir where to find their configs.
pull/3130/head
Slavi Pantaleev пре 2 година
committed by GitHub
родитељ
комит
954e568866
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 измењених фајлова са 4 додато и 2 уклоњено
  1. +2
    -1
      roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2
  2. +2
    -1
      roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2

+ 2
- 1
roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 Прегледај датотеку

@@ -29,7 +29,8 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for arg in matrix_bot_draupnir_container_extra_arguments %} {% for arg in matrix_bot_draupnir_container_extra_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
{{ matrix_bot_draupnir_docker_image }}
{{ matrix_bot_draupnir_docker_image }} \
bot --draupnir-config /data/config/production.yaml


{% for network in matrix_bot_draupnir_container_additional_networks %} {% for network in matrix_bot_draupnir_container_additional_networks %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-draupnir ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-draupnir


+ 2
- 1
roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2 Прегледај датотеку

@@ -29,7 +29,8 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for arg in matrix_bot_mjolnir_container_extra_arguments %} {% for arg in matrix_bot_mjolnir_container_extra_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
{{ matrix_bot_mjolnir_docker_image }}
{{ matrix_bot_mjolnir_docker_image }} \
bot --mjolnir-config /data/config/production.yaml


{% for network in matrix_bot_mjolnir_container_additional_networks %} {% for network in matrix_bot_mjolnir_container_additional_networks %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-mjolnir ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-mjolnir


Loading…
Откажи
Сачувај