Merge branch '877dev-master'

Author: gcgarner

scripts/docker_backup.sh

@@ -16,7 +16,7 @@ if [ $(docker ps | grep -c influxdb) -gt 0 ]; then
 fi
 
 #setup variables
-logfile=./backups/log.txt
+logfile=./backups/log_local.txt
 backupfile="backup-$(date +"%Y-%m-%d_%H%M").tar.gz"
 
 #compress the backups folders to archive
@@ -29,9 +29,10 @@ sudo tar -czf \
 
 rm list.txt
 
+#set permission for backup files
 sudo chown pi:pi ./backups/backup*
 
-#create log file and add the backup file to it
+#create local logfile and append the latest backup file to it
 echo "backup saved to ./backups/$backupfile"
 sudo touch $logfile
 sudo chown pi:pi $logfile
@@ -40,19 +41,60 @@ echo $backupfile >>$logfile
 #show size of archive file
 du -h ./backups/$backupfile
 
-#upload to cloud
+#remove older local backup files
+#to change backups retained,  change below +8 to whatever you want (days retained +1)
+ls -t1 ./backups/backup* | tail -n +8 | sudo xargs rm -f
+echo "last seven local backup files are saved in ~/IOTstack/backups"
+
+
+
+#cloud related - dropbox
 if [ -f ./backups/dropbox ]; then
+
+	#setup variables
+	dropboxfolder=/IOTstackBU
+	dropboxuploader=~/Dropbox-Uploader/dropbox_uploader.sh
+	dropboxlog=./backups/log_dropbox.txt
+
+	#upload new backup to dropbox
 	echo "uploading to dropbox"
-	~/Dropbox-Uploader/dropbox_uploader.sh upload ./backups/$backupfile /IOTstackBU/
+	$dropboxuploader upload ./backups/$backupfile $dropboxfolder
+
+	#list older files to be deleted from cloud (exludes last 7)
+	#to change dropbox backups retained, change below -7 to whatever you want
+	echo "checking for old backups on dropbox"
+	files=$($dropboxuploader list $dropboxfolder | awk {' print $3 '} | tail -n +2 | head -n -7)
+
+	#write files to be deleted to dropbox logfile
+	sudo touch $dropboxlog
+	sudo chown pi:pi $dropboxlog
+	echo $files | tr " " "\n" >$dropboxlog
+
+	#delete files from dropbox as per logfile
+	echo "deleting old backups from dropbox if they exist - last 7 files are kept"
+
+	#check older files exist on dropbox, if yes then delete them
+	if [ $( echo "$files" | grep -c "backup") -ne 0 ] ; then	
+		input=$dropboxlog
+		while IFS= read -r file
+		do
+	    	$dropboxuploader delete $dropboxfolder/$file
+		done < "$input"
+	fi
+
+	echo "backups deleted from dropbox" >>$dropboxlog
+
 fi
 
+
+#cloud related - google drive
 if [ -f ./backups/rclone ]; then
-	echo "uploading to Google Drive"
-	rclone -P copy ./backups/$backupfile gdrive:/IOTstackBU/
+	echo "synching to Google Drive"
+	echo "latest 7 backup files are kept"
+	#sync local backups to gdrive (older gdrive copies will be deleted)
+	rclone sync -P ./backups --include "/backup*"  gdrive:/IOTstackBU/
+	echo "synch with Google Drive complete"
 fi
 
-#remove older backup files
-ls -t1 ./backups/backup* | tail -n +6 | xargs rm -f
-echo "last five backup files are saved in ~/IOTstack/backups"
 
 popd