From f4f13e1081bba25e13cc209b378278a2d6a8b76a Mon Sep 17 00:00:00 2001 From: "Jason D. McCormick" Date: Fri, 24 Feb 2023 14:42:22 -0500 Subject: rename backup2webdav --- Makefile | 12 +++++------ backup2nextcloud | 28 ------------------------- backup2nextcloud-2.0_1.deb | Bin 1236 -> 0 bytes backup2nextcloud-hamvoip | 50 --------------------------------------------- backup2nextcloud-pistar | 48 ------------------------------------------- backup2nextcloud.cron | 9 -------- backup2webdav | 28 +++++++++++++++++++++++++ backup2webdav-hamvoip | 50 +++++++++++++++++++++++++++++++++++++++++++++ backup2webdav-pistar | 48 +++++++++++++++++++++++++++++++++++++++++++ backup2webdav.cron | 9 ++++++++ control | 8 ++++---- 11 files changed, 145 insertions(+), 145 deletions(-) delete mode 100755 backup2nextcloud delete mode 100644 backup2nextcloud-2.0_1.deb delete mode 100755 backup2nextcloud-hamvoip delete mode 100755 backup2nextcloud-pistar delete mode 100755 backup2nextcloud.cron create mode 100755 backup2webdav create mode 100755 backup2webdav-hamvoip create mode 100755 backup2webdav-pistar create mode 100755 backup2webdav.cron diff --git a/Makefile b/Makefile index 5534256..456c717 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,16 @@ INSTALLS = \ - $(DESTDIR)/usr/local/sbin/backup2nextcloud \ + $(DESTDIR)/usr/local/sbin/backup2webdav \ $(DESTDIR)/etc/backup-dirs \ - $(DESTDIR)/etc/cron.daily/backup2nextcloud \ + $(DESTDIR)/etc/cron.daily/backup2webdav \ -PKGN = backup2nextcloud +PKGN = backup2webdav MAJVER = 2.0 MINVER = 1 PKGD = $(PKGN)-$(MAJVER)_$(MINVER) -install: $(DESTDIR)/usr/local/sbin/backup2nextcloud $(DESTDIR)/etc/backup-dirs $(DESTDIR)/etc/cron.daily/backup2nextcloud +install: $(DESTDIR)/usr/local/sbin/backup2webdav $(DESTDIR)/etc/backup-dirs $(DESTDIR)/etc/cron.daily/backup2webdav -$(DESTDIR)/usr/local/sbin/backup2nextcloud: backup2nextcloud +$(DESTDIR)/usr/local/sbin/backup2webdav: backup2webdav test ! -d $(DESTDIR)/usr/local/sbin && mkdir -p $(DESTDIR)/usr/local/sbin install -m 0755 $< $@ @@ -18,7 +18,7 @@ $(DESTDIR)/etc/backup-dirs: backup-dirs test ! -d $(DESTDIR)/etc && mkdir -p $(DESTDIR)/etc install -m 0644 $< $@ -$(DESTDIR)/etc/cron.daily/backup2nextcloud: backup2nextcloud.cron +$(DESTDIR)/etc/cron.daily/backup2webdav: backup2webdav.cron test ! -d $(DESTDIR)/etc/cron.daily && mkdir -p $(DESTDIR)/etc/cron.daily install -m 0755 $< $@ diff --git a/backup2nextcloud b/backup2nextcloud deleted file mode 100755 index cb61d2e..0000000 --- a/backup2nextcloud +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -PATH=/usr/bin:/bin:/usr/sbin:/sbin - -F=`mktemp` -FT="/tmp/`hostname`.tar.bz2" - -if [ -f $FT ]; then - echo "File $FT exists - incomplete run?" - exit 1 -fi - -mv $F $FT - -tar -jcf $FT `cat /etc/backup-dirs | tr '\n' ' '` 2> /dev/null - -rclone copy $FT nextcloud:/ -RVAL=$? - -if [ $? == 0 ]; then - rm $FT - exit 0 -else - exit 1 -fi - - - diff --git a/backup2nextcloud-2.0_1.deb b/backup2nextcloud-2.0_1.deb deleted file mode 100644 index d27cdfc..0000000 Binary files a/backup2nextcloud-2.0_1.deb and /dev/null differ diff --git a/backup2nextcloud-hamvoip b/backup2nextcloud-hamvoip deleted file mode 100755 index 2128f22..0000000 --- a/backup2nextcloud-hamvoip +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -PATH=/usr/bin:/bin:/usr/sbin:/sbin - -FRVAL=0 - - - -for h in `cat /etc/backup-hamvoip | tr '\n' ' ' 2> /dev/null` -do - hn=`echo $h | perl -pe 's/^([^\.]+)\..*$/$1/g'` - - FT="/tmp/$hn.tar" - - if [ -f $FT ] || [ -f $FT.bz2 ]; then - echo "File $FT exists - incomplete run?" - exit 1 - fi - - F=`mktemp` - - mv $F $FT - - ssh -p 222 -o "PasswordAuthentication no" -o 'StrictHostKeyChecking no' \ - root@$h 'cd / && tar cf - etc/ root/ var/lib/asterisk/sounds/rpt/ srv/http/' > $FT - RVAL=$? - - if [ $RVAL != 0 ]; then - echo "Error pulling down from $h" - rm $FT - FRVAL=1 - else - - bzip2 $FT - rclone --bind=44.70.48.34 copy $FT.bz2 nextcloud:/Backups/$hn/ - RVAL=$? - - if [ $RVAL != 0 ]; then - echo "Error rsyncing $FT.bz2 to nextcloud" - FRVAL=1 - fi - - rm $FT.bz2 - fi - -done - -exit $FRVAL - - diff --git a/backup2nextcloud-pistar b/backup2nextcloud-pistar deleted file mode 100755 index abac569..0000000 --- a/backup2nextcloud-pistar +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -PATH=/usr/bin:/bin:/usr/sbin:/sbin - -FRVAL=0 - -AUTH='pi-star:wtfwtfwtf!' - -for h in `cat /etc/backup-pistar | tr '\n' ' ' 2> /dev/null` -do - hn=`echo $h | perl -pe 's/^([^\.]+)\..*$/$1/g'` - - FT="/tmp/$hn.zip" - - if [ -f $FT ]; then - echo "File $FT exists - incomplete run?" - exit 1 - fi - - F=`mktemp` - - mv $F $FT - - curl -s -d "action=download" -X POST --user $AUTH --output $FT http://$h/admin/config_backup.php - RVAL=$? - - if [ $RVAL != 0 ]; then - echo "Error pulling down from $h" - rm $FT - FRVAL=1 - else - - rclone --bind=44.70.48.34 copy $FT nextcloud:/Backups/$hn/ - RVAL=$? - - if [ $RVAL != 0 ]; then - echo "Error rsyncing $FT to nextcloud" - FRVAL=1 - fi - - rm $FT - fi - -done - -exit $FRVAL - - diff --git a/backup2nextcloud.cron b/backup2nextcloud.cron deleted file mode 100755 index 083007a..0000000 --- a/backup2nextcloud.cron +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ -f /var/lib/mysql/ib_logfile0 ] && [ -d /var/lib/mysql-backup ]; then - /usr/bin/mysqldump -u root --all-databases > /var/lib/mysql-backup -fi - -sleep $(( $RANDOM % 15 + 1 ))m -/usr/local/sbin/backup2nextcloud - diff --git a/backup2webdav b/backup2webdav new file mode 100755 index 0000000..cb61d2e --- /dev/null +++ b/backup2webdav @@ -0,0 +1,28 @@ +#!/bin/bash + +PATH=/usr/bin:/bin:/usr/sbin:/sbin + +F=`mktemp` +FT="/tmp/`hostname`.tar.bz2" + +if [ -f $FT ]; then + echo "File $FT exists - incomplete run?" + exit 1 +fi + +mv $F $FT + +tar -jcf $FT `cat /etc/backup-dirs | tr '\n' ' '` 2> /dev/null + +rclone copy $FT nextcloud:/ +RVAL=$? + +if [ $? == 0 ]; then + rm $FT + exit 0 +else + exit 1 +fi + + + diff --git a/backup2webdav-hamvoip b/backup2webdav-hamvoip new file mode 100755 index 0000000..2128f22 --- /dev/null +++ b/backup2webdav-hamvoip @@ -0,0 +1,50 @@ +#!/bin/bash + +PATH=/usr/bin:/bin:/usr/sbin:/sbin + +FRVAL=0 + + + +for h in `cat /etc/backup-hamvoip | tr '\n' ' ' 2> /dev/null` +do + hn=`echo $h | perl -pe 's/^([^\.]+)\..*$/$1/g'` + + FT="/tmp/$hn.tar" + + if [ -f $FT ] || [ -f $FT.bz2 ]; then + echo "File $FT exists - incomplete run?" + exit 1 + fi + + F=`mktemp` + + mv $F $FT + + ssh -p 222 -o "PasswordAuthentication no" -o 'StrictHostKeyChecking no' \ + root@$h 'cd / && tar cf - etc/ root/ var/lib/asterisk/sounds/rpt/ srv/http/' > $FT + RVAL=$? + + if [ $RVAL != 0 ]; then + echo "Error pulling down from $h" + rm $FT + FRVAL=1 + else + + bzip2 $FT + rclone --bind=44.70.48.34 copy $FT.bz2 nextcloud:/Backups/$hn/ + RVAL=$? + + if [ $RVAL != 0 ]; then + echo "Error rsyncing $FT.bz2 to nextcloud" + FRVAL=1 + fi + + rm $FT.bz2 + fi + +done + +exit $FRVAL + + diff --git a/backup2webdav-pistar b/backup2webdav-pistar new file mode 100755 index 0000000..abac569 --- /dev/null +++ b/backup2webdav-pistar @@ -0,0 +1,48 @@ +#!/bin/bash + +PATH=/usr/bin:/bin:/usr/sbin:/sbin + +FRVAL=0 + +AUTH='pi-star:wtfwtfwtf!' + +for h in `cat /etc/backup-pistar | tr '\n' ' ' 2> /dev/null` +do + hn=`echo $h | perl -pe 's/^([^\.]+)\..*$/$1/g'` + + FT="/tmp/$hn.zip" + + if [ -f $FT ]; then + echo "File $FT exists - incomplete run?" + exit 1 + fi + + F=`mktemp` + + mv $F $FT + + curl -s -d "action=download" -X POST --user $AUTH --output $FT http://$h/admin/config_backup.php + RVAL=$? + + if [ $RVAL != 0 ]; then + echo "Error pulling down from $h" + rm $FT + FRVAL=1 + else + + rclone --bind=44.70.48.34 copy $FT nextcloud:/Backups/$hn/ + RVAL=$? + + if [ $RVAL != 0 ]; then + echo "Error rsyncing $FT to nextcloud" + FRVAL=1 + fi + + rm $FT + fi + +done + +exit $FRVAL + + diff --git a/backup2webdav.cron b/backup2webdav.cron new file mode 100755 index 0000000..083007a --- /dev/null +++ b/backup2webdav.cron @@ -0,0 +1,9 @@ +#!/bin/bash + +if [ -f /var/lib/mysql/ib_logfile0 ] && [ -d /var/lib/mysql-backup ]; then + /usr/bin/mysqldump -u root --all-databases > /var/lib/mysql-backup +fi + +sleep $(( $RANDOM % 15 + 1 ))m +/usr/local/sbin/backup2nextcloud + diff --git a/control b/control index b10f9ba..42b59b0 100644 --- a/control +++ b/control @@ -1,9 +1,9 @@ -Package: backup2nextcloud -Version: 2.0-1 +Package: backup2webdav +Version: 3.0-1 Section: base Priority: optional Architecture: all Maintainer: Jason McCormick Depends: rclone, tar, bzip2 -Description: Backup a system to Nextcloud using rclone - +Description: Backup a system to WebDAV using rclone +Replaces: backup2nextcloud -- cgit v1.2.3