From 8d1347a34cb21b8a139ccba1f981cea6fc8dc0b8 Mon Sep 17 00:00:00 2001
From: matthias <matthias@bilger.info>
Date: Wed, 16 Oct 2019 04:56:25 +0000
Subject: [PATCH 1/6] =?UTF-8?q?=E2=80=9Ebackup.sh=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backup.sh b/backup.sh
index 101d881..8a1c3da 100644
--- a/backup.sh
+++ b/backup.sh
@@ -23,12 +23,20 @@ healthchck_fail(){
 	fi
 }
 
+healthchck_start(){
+	if [ -n $HEALTHCHECK_URL ]; then
+	 	curl --retry 3 $HEALTHCHECK_URL/start
+		exit 1
+	fi
+}
+
 healthchck_ok(){
 	if [ -n $HEALTHCHECK_URL ]; then
 	 	curl --retry 3 $HEALTHCHECK_URL
 	fi
 }
 
+healthchck_start
 cd /backup
 echo "make archive"
 tar -c --checkpoint=.1000 ${TAR_PARAM} ${TAR_EXTRA_PARAM} -f ~/$BACKUP_FILENAME ./* || healthchck_fail

From 37664e83bc2dbb43ee0e446ec6a1389e12c869c8 Mon Sep 17 00:00:00 2001
From: matthias <matthias@bilger.info>
Date: Wed, 16 Oct 2019 07:08:29 +0000
Subject: [PATCH 2/6] =?UTF-8?q?=E2=80=9Ebackup.sh=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backup.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/backup.sh b/backup.sh
index 8a1c3da..78520d5 100644
--- a/backup.sh
+++ b/backup.sh
@@ -18,21 +18,20 @@ fi
 
 healthchck_fail(){
 	if [ -n $HEALTHCHECK_URL ]; then
-	 	curl --retry 3 $HEALTHCHECK_URL/fail
+	 	curl --retry 3 $HEALTHCHECK_URL/fail  --silent --output /dev/null
 		exit 1
 	fi
 }
 
 healthchck_start(){
 	if [ -n $HEALTHCHECK_URL ]; then
-	 	curl --retry 3 $HEALTHCHECK_URL/start
-		exit 1
+	 	curl --retry 3 $HEALTHCHECK_URL/start  --silent --output /dev/null
 	fi
 }
 
 healthchck_ok(){
 	if [ -n $HEALTHCHECK_URL ]; then
-	 	curl --retry 3 $HEALTHCHECK_URL
+	 	curl --retry 3 $HEALTHCHECK_URL --silent --output /dev/null
 	fi
 }
 

From bc69b6f873a96d00235e26e05ea3cfcf7481017e Mon Sep 17 00:00:00 2001
From: matthias <matthias@bilger.info>
Date: Fri, 1 Nov 2019 06:42:15 +0000
Subject: [PATCH 3/6] =?UTF-8?q?=E2=80=9Ebackup.sh=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backup.sh b/backup.sh
index 78520d5..dbaa663 100644
--- a/backup.sh
+++ b/backup.sh
@@ -56,6 +56,6 @@ echo "done"
 # On first month day do
 if [ "$month_day" -eq 1 ] ; then
   echo "make monthly backup"
-  aws s3 cp s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME_MONTHLY.gpg --storage-class DEEP_ARCHIVE || (curl --retry 3 https://health.d1v3.de/ping/8183024f-0aa5-4e19-90a2-c1325a5408ae/fail && exit 1)
+  aws s3 cp s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME_MONTHLY.gpg --storage-class DEEP_ARCHIVE || healthchck_fail
 fi
 healthchck_ok

From 631cb048acc851d03dce0d4dadea38d33366d3fe Mon Sep 17 00:00:00 2001
From: matthias <matthias@bilger.info>
Date: Thu, 28 Nov 2019 08:06:41 +0000
Subject: [PATCH 4/6] =?UTF-8?q?=E2=80=9Ebackup.sh=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

details to healthcheck.
---
 backup.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/backup.sh b/backup.sh
index dbaa663..d375d17 100644
--- a/backup.sh
+++ b/backup.sh
@@ -18,44 +18,44 @@ fi
 
 healthchck_fail(){
 	if [ -n $HEALTHCHECK_URL ]; then
-	 	curl --retry 3 $HEALTHCHECK_URL/fail  --silent --output /dev/null
+	 	curl -X POST --data $1 --retry 3 $HEALTHCHECK_URL/fail  --silent --output /dev/null
 		exit 1
 	fi
 }
 
 healthchck_start(){
 	if [ -n $HEALTHCHECK_URL ]; then
-	 	curl --retry 3 $HEALTHCHECK_URL/start  --silent --output /dev/null
+	 	curl -X POST --data $1 --retry 3 $HEALTHCHECK_URL/start  --silent --output /dev/null
 	fi
 }
 
 healthchck_ok(){
 	if [ -n $HEALTHCHECK_URL ]; then
-	 	curl --retry 3 $HEALTHCHECK_URL --silent --output /dev/null
+	 	curl -X POST --data $1 --retry 3 $HEALTHCHECK_URL --silent --output /dev/null
 	fi
 }
 
 healthchck_start
 cd /backup
 echo "make archive"
-tar -c --checkpoint=.1000 ${TAR_PARAM} ${TAR_EXTRA_PARAM} -f ~/$BACKUP_FILENAME ./* || healthchck_fail
+tar -c --checkpoint=.1000 ${TAR_PARAM} ${TAR_EXTRA_PARAM} -f ~/$BACKUP_FILENAME ./* || healthchck_fail  "TAR Failed"
 cd /
 echo " done"
 
 RECIPIENT=$(echo "$GPG_RECIPIENT" | sed "s/,/ --recipient /")
 
 echo "encrypting"
-gpg --trust-model always --enable-progress-filter --output ~/$BACKUP_FILENAME.gpg --encrypt --recipient $RECIPIENT ~/$BACKUP_FILENAME || healthchck_fail
+gpg --trust-model always --enable-progress-filter --output ~/$BACKUP_FILENAME.gpg --encrypt --recipient $RECIPIENT ~/$BACKUP_FILENAME || healthchck_fail "Encryption Failed"
 rm ~/$BACKUP_FILENAME
 
 echo "uploading"
-aws s3 cp ~/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg --storage-class STANDARD_IA || healthchck_fail
+aws s3 cp ~/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg --storage-class STANDARD_IA || healthchck_fail "Upload Failed"
 rm ~/$BACKUP_FILENAME.gpg
 echo "done"
 
 # On first month day do
 if [ "$month_day" -eq 1 ] ; then
   echo "make monthly backup"
-  aws s3 cp s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME_MONTHLY.gpg --storage-class DEEP_ARCHIVE || healthchck_fail
+  aws s3 cp s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME_MONTHLY.gpg --storage-class DEEP_ARCHIVE || healthchck_fail "failed to create monthly backup"
 fi
-healthchck_ok
+healthchck_ok "Success"

From 140f33ee9b88493464d8587159b91f63fee2fad7 Mon Sep 17 00:00:00 2001
From: matthias <matthias@bilger.info>
Date: Thu, 28 Nov 2019 08:09:30 +0000
Subject: [PATCH 5/6] =?UTF-8?q?=E2=80=9Ebackup.sh=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backup.sh b/backup.sh
index d375d17..15788a1 100644
--- a/backup.sh
+++ b/backup.sh
@@ -35,7 +35,7 @@ healthchck_ok(){
 	fi
 }
 
-healthchck_start
+healthchck_start "Starting Update"
 cd /backup
 echo "make archive"
 tar -c --checkpoint=.1000 ${TAR_PARAM} ${TAR_EXTRA_PARAM} -f ~/$BACKUP_FILENAME ./* || healthchck_fail  "TAR Failed"

From da018581344c4a325236d5b85eb7140d2a160005 Mon Sep 17 00:00:00 2001
From: matthias <matthias@bilger.info>
Date: Fri, 29 Nov 2019 07:19:59 +0000
Subject: [PATCH 6/6] =?UTF-8?q?=E2=80=9Ebackup.sh=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backup.sh b/backup.sh
index 15788a1..36d5c49 100644
--- a/backup.sh
+++ b/backup.sh
@@ -35,7 +35,7 @@ healthchck_ok(){
 	fi
 }
 
-healthchck_start "Starting Update"
+healthchck_start "Starting Backup"
 cd /backup
 echo "make archive"
 tar -c --checkpoint=.1000 ${TAR_PARAM} ${TAR_EXTRA_PARAM} -f ~/$BACKUP_FILENAME ./* || healthchck_fail  "TAR Failed"