From 3cb5855dcb43e4cf9e6c1a48265cd8b50c33411b Mon Sep 17 00:00:00 2001
From: Robin Kloppe <git@mainboarder.de>
Date: Tue, 30 Apr 2024 20:45:13 +0200
Subject: [PATCH 1/3] README.md

---
 README.md | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index e7aadc2..ed48e96 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,3 @@
-Froxlorbackup
-=============
-
-Backup your Froxlor Webhosting (or anything else) to another server. Encrypted, via ssh.
-
-Works for all versions.
-
-0. install duplicity and all required packages
-1. copy the script to the froxlorserver and run it as `/$PATH/backup-server.sh full`
-2. Add a cronjob like `17 2 * * * /$PATH/backup-server.sh`
-3. Let the magic happen
-
-You can restore your data with
-`duplicity -t nD --file-to-restore relative/neddedFile $EXTERNALPATH/TO//media/mount/duplicity/ /where/to/save/now`
-
-| Parameter | Description|
-| ------------- | ------------- |
-| `-t nD` | The version from how much days in the past should be recovered? |
-| `relative/neddedFile` | Where, relative from the next parameter is the file in the backup? |
-| `$EXTERNALPATH/TO//media/mount/duplicity/` | Where are the duplicity-files stored on the external storage? |
-| `/where/to/save/now` | Where should the recovered file saved to (must not exist)? |
-
-Example:
-`duplicity -t 8D --file-to-restore apache2/sites-available/site.conf ssh://backup@hostname2.domain.tld//home/hostname1/etc /home/user/site.conf`
-
-If you execute this on the machine where you want to restore an eight days old `/etc/apache2/sites-available/site.conf` from the external machine `hostname2.domain.tld`, then the recovered file will be saved in `/home/user/site.conf`
+# Github discontinued
+This project may not have latest commits as newer commits will not be published at github.
+Find latest development at [git.mainboarder.de](https://git.mainboarder.de/Public/Froxlorbackup).

From c5f72997f876f3f8c20b12a43d02c278fc1c113b Mon Sep 17 00:00:00 2001
From: Robin Kloppe <git@mainboarder.de>
Date: Tue, 30 Apr 2024 20:57:57 +0200
Subject: [PATCH 2/3] static passphrase

---
 backup-server.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/backup-server.sh b/backup-server.sh
index ba6714a..7fedc05 100644
--- a/backup-server.sh
+++ b/backup-server.sh
@@ -49,10 +49,18 @@ BDIRS="etc var/customers"
 ENDDIR="/media/hddmount/duplicity"
 LOGDIR='/var/log/duplicity' # must exist
 
-# Setting the pass phrase to encrypt the backup files. Will use symmetrical keys in this case.
+# Setting the passphrase to encrypt the backup files. Will use symmetrical keys in this case.
 # Set one Password per Backup
-PASSPHRASE=$(dd if=/dev/urandom 2>/dev/null | tr -cd '[:alnum:]' | fold -w21 | head -1)
-export PASSPHRASE
+# Hint: generate a safe password: dd if=/dev/urandom 2>/dev/null | tr -cd '[:alnum:]' | fold -w21 | head -1
+PASSPHRASE="none"
+
+if [ $PASSPHRASE != "none" ]
+then
+  export PASSPHRASE
+else
+  echo "Please set a passphrase in the skript"
+  exit 1
+fi
 
 # encryption algorithm for gpg, disable for default (CAST5)
 # see available ones via 'gpg --version'

From 1e2055ec9a30bd5e903d192761c2744b97c22360 Mon Sep 17 00:00:00 2001
From: Robin Kloppe <git@mainboarder.de>
Date: Tue, 30 Apr 2024 21:00:24 +0200
Subject: [PATCH 3/3] typo

---
 backup-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backup-server.sh b/backup-server.sh
index 7fedc05..b47fc5b 100644
--- a/backup-server.sh
+++ b/backup-server.sh
@@ -58,7 +58,7 @@ if [ $PASSPHRASE != "none" ]
 then
   export PASSPHRASE
 else
-  echo "Please set a passphrase in the skript"
+  echo "Please set a passphrase in the script"
   exit 1
 fi