Merge branch 'master' into synapse-workers

2025-08-18 12:51:31 +02:00 · 2021-01-27 10:27:17 +02:00
parent a9af36841d 512f42aa76
commit d98a1ceadd
36 changed files with 154 additions and 148 deletions
--- a/roles/matrix-postgres/templates/systemd/matrix-postgres.service.j2
+++ b/roles/matrix-postgres/templates/systemd/matrix-postgres.service.j2
@@ -9,7 +9,7 @@ DefaultDependencies=no
 Type=simple
 Environment="HOME={{ matrix_systemd_unit_home_path }}"
 ExecStartPre=-{{ matrix_host_command_docker }} stop matrix-postgres
-ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-postgres
+ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-postgres 2>/dev/null'

 ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-postgres \
 			--log-driver=none \
@@ -35,7 +35,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-postgres \
 			{% endfor %}

 ExecStop=-{{ matrix_host_command_docker }} stop matrix-postgres
-ExecStop=-{{ matrix_host_command_docker }} rm matrix-postgres
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-postgres 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-postgres