From 6ebe7b8831481d580d424aeb442500d00558e9e1 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Fri, 17 Mar 2023 01:06:47 +0100
Subject: [PATCH] Improved Plan B scripts.

---
 Plan Borg/bin/dobackup-rsync | 10 +++-------
 Plan Borg/bin/doinit-rsync   |  9 +++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 Plan Borg/bin/dobackup-rsync

diff --git a/Plan Borg/bin/dobackup-rsync b/Plan Borg/bin/dobackup-rsync
old mode 100644
new mode 100755
index 621dab5..ff688d1
--- a/Plan Borg/bin/dobackup-rsync	
+++ b/Plan Borg/bin/dobackup-rsync	
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 help()
 {
@@ -17,14 +17,10 @@ fi
 if (( $help )); then
     help
 else
-    MACHINE="$1"
+    COMPUTER="$1"
     REMOTE_USER=admin666
     echo "===== $COMPUTER ====="
-    # rsync
-    rsync root@${COMPUTER} /var/backups/borg/mirrors/$COMPUTER --exclude
-
-    # Backup the rsync directory.    
-    CONFIG="/etc/borgmatic.d/$COMPUTER.conf"
+    CONFIG="/etc/borgmatic.d/$COMPUTER.yaml"
     if [ -f "$CONFIG" ]; then
 	borgmatic -c $CONFIG create $OPTIONS --stats --verbosity 1 --syslog-verbosity 1
     fi
diff --git a/Plan Borg/bin/doinit-rsync b/Plan Borg/bin/doinit-rsync
index cf64d9c..e710bb6 100755
--- a/Plan Borg/bin/doinit-rsync	
+++ b/Plan Borg/bin/doinit-rsync	
@@ -23,9 +23,14 @@ if (( $help )); then
 else
     COMPUTER="$1"
 
-    # TODOOOOOOOOOOOOOOOOOOOOOOOOOO
+    echo "== Create the mirroring directory."
+    mkdir /var/backups/borg/mirrors/${COMPUTER}
+
+    echo "== Create dedicated cache."
+    mkdir /var/backups/borg/mirrors/${COMPUTER}.cache
+    
     echo "== Create the borgmatic configuration file."
-    cp /srv/borg/models/model-conf-remote.yaml /etc/borgmatic.d/${COMPUTER}.yaml
+    cp /srv/borg/models/model-conf-rsync.yaml /etc/borgmatic.d/${COMPUTER}.yaml
     
     echo "== Update the repository directory in borgmatic configuration file."
     sed -i s/\<HOSTNAME\>/${COMPUTER}/g /etc/borgmatic.d/${COMPUTER}.yaml