From f51980f7b9a6e26a83a4853639946012264c03ed Mon Sep 17 00:00:00 2001
From: korenstin <korenstin@crans.org>
Date: Sat, 21 Dec 2024 19:57:48 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20simultan=C3=A9it=C3=A9=20et=20retr?=
 =?UTF-8?q?ait=20de=20jitsi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 host_vars/jitsi.adm.crans.org.yml                      | 10 ----------
 hosts                                                  |  6 ------
 roles/restic-client/tasks/main.yml                     |  8 ++++++--
 .../templates/systemd/system/restic-base.service.j2    |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 host_vars/jitsi.adm.crans.org.yml

diff --git a/host_vars/jitsi.adm.crans.org.yml b/host_vars/jitsi.adm.crans.org.yml
deleted file mode 100644
index b98b6279..00000000
--- a/host_vars/jitsi.adm.crans.org.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-interfaces:
-  adm: ens18
-  srv: ens19
-
-loc_unattended:
-  reboot: true
-
-loc_needrestart:
-  override: []
diff --git a/hosts b/hosts
index 0d5406cc..a1a188b3 100644
--- a/hosts
+++ b/hosts
@@ -36,7 +36,6 @@ proxy-pve-adh.adm.crans.org
 [certbot:children]
 dovecot
 galene
-jitsi
 postfix
 reverseproxy
 virtu
@@ -98,9 +97,6 @@ fyre.adm.crans.org
 [irc]
 irc.adm.crans.org
 
-[jitsi]
-jitsi.adm.crans.org
-
 [keepalived]
 routeur-daniel.adm.crans.org
 routeur-jack.adm.crans.org
@@ -133,7 +129,6 @@ ptf.adm.crans.org
 [nginx:children]
 django_cas
 galene
-jitsi
 mailman
 mirror_frontend
 printer
@@ -287,7 +282,6 @@ gitzly.adm.crans.org
 helloworld.adm.crans.org
 hodaur.adm.crans.org
 irc.adm.crans.org
-jitsi.adm.crans.org
 kenobi.adm.crans.org
 kiwi.adm.crans.org
 linx.adm.crans.org
diff --git a/roles/restic-client/tasks/main.yml b/roles/restic-client/tasks/main.yml
index b5b0be61..0c77d506 100644
--- a/roles/restic-client/tasks/main.yml
+++ b/roles/restic-client/tasks/main.yml
@@ -26,7 +26,9 @@
   with_nested:
     - "{{ restic.config }}"
     - { .env, -excludes, -includes, -password, -repo }
-  notify: Restart timer
+  notify:
+    - Restart timer
+    - systemctl daemon-reload
 
 - name: Deploy restic systemd
   template:
@@ -38,7 +40,9 @@
   with_nested:
     - "{{ restic.config }}"
     - { .service, .timer }
-  notify: Restart timer
+  notify:
+    - Restart timer
+    - systemctl daemon-reload
 
 - name: Init restic repository (Debian >=12)
   command:
diff --git a/roles/restic-client/templates/systemd/system/restic-base.service.j2 b/roles/restic-client/templates/systemd/system/restic-base.service.j2
index ba9e831c..456aec95 100644
--- a/roles/restic-client/templates/systemd/system/restic-base.service.j2
+++ b/roles/restic-client/templates/systemd/system/restic-base.service.j2
@@ -7,7 +7,7 @@ Wants=network-online.target
 [Service]
 EnvironmentFile=/etc/restic/{{ item.0 }}.env
 ExecStart=restic backup --files-from=/etc/restic/{{ item.0 }}-includes --exclude-file=/etc/restic/{{ item.0 }}-excludes{{ restic.config[item.0].backup_extra_param | default("") }}
-ExecStart=restic forget --prune{% for freq, n in restic.config[item.0].retention %} {{ freq }} {{ n }}{% endfor %}
+ExecStartPost=restic forget --prune{% for freq, n in restic.config[item.0].retention %} {{ freq }} {{ n }}{% endfor %}
 
 Type=oneshot
 User=root