Merge branch 'main' of github.com:acedanger/shell

backup-docker.sh

@@ -2,24 +2,19 @@
 
 # vaultwarden
 tar zcf /home/acedanger/backup/docker-data/vaultwarden-data-bk-`date +%Y%m%d`.tar.gz  /var/lib/docker/volumes/vaultwarden_data/_data
-rclone move /home/acedanger/backup/docker-data/vaultwarden-data-bk-`date +%Y%m%d`.tar.gz onedrive:Documents/rclone/vaultwarden
 
 # portainer
 tar zcf /home/acedanger/backup/docker-data/portainer-data-bk-`date +%Y%m%d`.tar.gz /var/lib/docker/volumes/portainer_data/_data
-rclone move /home/acedanger/backup/docker-data/portainer-data-bk-`date +%Y%m%d`.tar.gz onedrive:Documents/rclone/portainer
 
 # paperless
 tar zcf /home/acedanger/backup/docker-data/paperless-data-bk-`date +%Y%m%d`.tar.gz /var/lib/docker/volumes/paperless-ng_data/_data
 tar zcf /home/acedanger/backup/docker-data/paperless-media-bk-`date +%Y%m%d`.tar.gz /var/lib/docker/volumes/paperless-ng_media/_data
 tar zcf /home/acedanger/backup/docker-data/paperless-pgdata-bk-`date +%Y%m%d`.tar.gz /var/lib/docker/volumes/paperless-ng_pgdata/_data
 
-rclone move /home/acedanger/backup/docker-data/paperless-data-bk-`date +%Y%m%d`.tar.gz onedrive:Documents/rclone/paperless
-rclone move /home/acedanger/backup/docker-data/paperless-media-bk-`date +%Y%m%d`.tar.gz onedrive:Documents/rclone/paperless
-rclone move /home/acedanger/backup/docker-data/paperless-pgdata-bk-`date +%Y%m%d`.tar.gz onedrive:Documents/rclone/paperless
 
 # send a notification to https://notify.peterwood.rocks\lab
 curl \
   -H priority:default \
   -H tags:backup,docker,vaultwarden,portainer,paperless,${HOSTNAME} \
   -d "Completed backup of vaultwarden, portainer, paperless data" \
-  https://notify.peterwood.rocks/lab
+  https://notify.peterwood.rocks/lab

move-backups.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+if [ ! "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
+	exit 1
+fi
+
+source="/home/acedanger/backup/docker-data/"
+destination="/mnt/share/media/backups/docker-data/"
+
+command="rsync \
+	--archive --verbose --progress --dry-run --stats \
+	-e 'ssh -p 58022' \
+	--include '*.gz' \
+	acedanger@vperanda:$source $destination \
+	| fgrep 'Number of files' | cut -d' ' -f4 | tr -d ,"
+
+# echo 'Running command => '
+# echo $command
+
+num_files=$(rsync \
+	--archive --verbose --progress --dry-run --stats \
+	-e 'ssh -p 58022' \
+	--include '*.gz' \
+	acedanger@vperanda:$source $destination \
+	| fgrep 'Number of files' | cut -d' ' -f4 | tr -d ,
+	)
+
+# echo 'There are' "${num_files}" 'file(s) to be transferred.'
+
+if [ "$num_files" == 0 ];
+then
+	echo 'There are no files to transfer. Exiting.'
+	exit 1
+fi
+
+# move the files from $source to $destination
+rsync \
+	--recursive --verbose --progress --remove-source-files --archive \
+	-e 'ssh -p 58022' \
+	--include '*.gz' \
+	acedanger@vperanda:$source $destination
+
+# send a notification to https://notify.peterwood.rocks/lab
+curl \
+  -H priority:default \
+  -H tags:backups,${HOSTNAME} \
+  -d "The backups have been moved to the NAS." \
+  https://notify.peterwood.rocks/lab

update-portainer.sh

@@ -50,5 +50,5 @@ esac
 curl \
   -H priority:default \
   -H tags:update,docker,portainer,${HOSTNAME} \
-  -d "The ${image_name} portainer image has been updated." \
+  -d "The ${image_name} image has been updated." \
   https://notify.peterwood.rocks/lab