From 1bba7b29edb97e357acc685174ed2e8e41fe5fe1 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Tue, 4 Apr 2023 09:32:02 +0200
Subject: [PATCH] Backuping new Discourse instance.

---
 README.md                                     | 42 ++++++++++++++++++-
 backup.yml                                    |  5 ++-
 roles/rsnapshoter/templates/rsnapshot.conf.j2 |  2 +-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 66e5670..c4266f7 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,7 @@ Il faut configurer le `.env` tel que:
 Puis vérifier qu’exim et le firewall (attention c’est peut-être `ufw`)
 les acceptent.
 
+
 ## backup1.afpy.org
 
 ♥ Machine sponsorisée par Gandi ♥
@@ -165,14 +166,51 @@ C’est un « Gandi Cloud V5 » à Bissen au Luxembourg avec 512MB de RAM
 et 512GB de disque, il sauvegarde (via rsnapshot) les autres machines
 (voir `backup.yml`).
 
-Dernière vérification de `backup1.afpy.org` le 2 janvier 2023 via :
+Dernière vérification de `backup1.afpy.org` le 2 avril 2023 via :
 
     ssh root@backup1.afpy.org sh check-afpy.sh
 
-Dernière vérification de `silence` (chez Julien) le 2 janvier 2023 via :
+Dernière vérification de `silence` (chez Julien) le 2 avril 2023 via :
 
     ssh root@silence sh /srv/backups/check-afpy.sh
 
+<details>
+<summary>
+
+Le script `check-afpy.sh`.
+
+</summary>
+
+```bash
+#!/bin/sh
+
+BASE=/srv/backups/rsnapshot_afpy
+
+for machine in bbb deb git discuss
+do
+    echo "# $machine.afpy.org"
+    echo
+    rsnapshot-diff -H "$BASE/weekly.0/$machine.afpy.org" "$BASE/daily.0/$machine.afpy.org"
+    echo
+    echo
+done
+echo '# discuss.afpy.org'
+echo
+ls -lahtr $BASE/daily.0/discuss.afpy.org/var/discourse/shared/standalone/backups/default/ | sed 's/^/    /'
+echo
+echo
+echo '# logs.afpy.org'
+echo
+ls -lahtr $BASE/daily.0/deb.afpy.org/var/www/logs.afpy.org/ | tail | sed 's/^/    /'
+echo
+echo
+echo '# git.afpy.org'
+echo
+ls -lahtr $BASE/daily.0/git.afpy.org/var/backups/gitea/ | sed 's/^/    /'
+```
+
+</details>
+
 
 ## gitea1.afpy.org
 
diff --git a/backup.yml b/backup.yml
index f8e61b2..edc0859 100644
--- a/backup.yml
+++ b/backup.yml
@@ -34,10 +34,11 @@
         path: deb.afpy.org/
       - remote: deb2.afpy.org:/etc/
         path: deb.afpy.org/
-      - remote: deb2.afpy.org:/var/discourse/shared/standalone/backups/
-        path: deb.afpy.org/
       - remote: deb2.afpy.org:/var/www/
         path: deb.afpy.org/
 
       - remote: gitea1.afpy.org:/var/backups/
         path: git.afpy.org/
+
+      - remote: discourse1.afpy.org:/var/discourse/shared/standalone/backups/
+        path: discuss.afpy.org/
diff --git a/roles/rsnapshoter/templates/rsnapshot.conf.j2 b/roles/rsnapshoter/templates/rsnapshot.conf.j2
index 777afd9..77fdfda 100644
--- a/roles/rsnapshoter/templates/rsnapshot.conf.j2
+++ b/roles/rsnapshoter/templates/rsnapshot.conf.j2
@@ -13,7 +13,7 @@ retain	weekly	4
 retain	monthly	12
 retain	yearly	42
 verbose	2
-loglevel	2
+loglevel	3
 logfile	/var/log/rsnapshot_{{ rsnapshot_name }}.log
 lockfile	/var/run/rsnapshot_{{ rsnapshot_name }}.pid