From 278d61759a89351d751b4cc4479fa23cae346b0d Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 11 Jan 2021 15:01:09 +0100
Subject: [PATCH] refactored

---
 roles/native-primary-backup/tasks/main.yml      | 16 ----------------
 .../templates/ssh-wrapper.sh.j2                 | 17 +++++++++++------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 roles/native-primary-backup/tasks/main.yml

diff --git a/roles/native-primary-backup/tasks/main.yml b/roles/native-primary-backup/tasks/main.yml
deleted file mode 100644
index 8e70ed94..00000000
--- a/roles/native-primary-backup/tasks/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Create sftp group
-# groupadd sftpusers
-# useradd -g sftpusers -d /incoming -s /sbin/nologin guestuser
-# passwd guestuser
-# grep guestuser /etc/passwd
-# usermod -g sftpusers -d /incoming -s /sbin/nologin john
-# Subsystem       sftp    internal-sftp > /etc/ssh/sshd_config
-# tail /etc/ssh/sshd_config
-# mkdir /sftp
-# mkdir /sftp/guestuser
-# mkdir /sftp/guestuser/incoming
-# chown guestuser:sftpusers /sftp/guestuser/incoming
-# ls -ld /sftp/guestuser/incoming
-# ls -ld /sftp/guestuser
-# ls -ld /sftp
-# service sshd restart
diff --git a/roles/native-user-backup/templates/ssh-wrapper.sh.j2 b/roles/native-user-backup/templates/ssh-wrapper.sh.j2
index d54c04fa..e9ad8d7f 100644
--- a/roles/native-user-backup/templates/ssh-wrapper.sh.j2
+++ b/roles/native-user-backup/templates/ssh-wrapper.sh.j2
@@ -6,16 +6,21 @@ then
   echo "`/bin/date`: $SSH_ORIGINAL_COMMAND" | systemd-cat -t "ssh-wrapper.sh"
 fi
 
+# define executable commands
+hashed_machine_id_command="sha256sum /etc/machine-id";
+find_command="find /Backups/{{hashed_machine_id.stdout}}/ -maxdepth 1 -type d";
+rsync_command="sudo rsync --server --sender -blogDtpre.iLsfxCIvu --backup-dir /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/diffs/current/ . /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/latest/"
+
 # filter commands
 case "$SSH_ORIGINAL_COMMAND" in
-	"sha256sum /etc/machine-id")
-		sha256sum /etc/machine-id
+	"$hashed_machine_id_command")
+		$hashed_machine_id_command
 		;;
-	"find /Backups/{{hashed_machine_id.stdout}}/ -maxdepth 1 -type d")
-		find /Backups/{{hashed_machine_id.stdout}}/ -maxdepth 1 -type d
+	"$find_command")
+		$find_command
 		;;
-	"sudo rsync --server --sender -blogDtpre.iLsfxCIvu --backup-dir /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/diffs/current/ . /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/latest/")
-		sudo rsync --server --sender -blogDtpre.iLsfxCIvu --backup-dir /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/diffs/current/ . /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/latest/
+	"$rsync_command")
+		$rsync_command
 		;;
 	*)
 		echo "This command is not supported."