From 793dc61e876e813e0a487adfcb0e169b29c00d08 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 May 2025 01:34:48 +0000 Subject: [PATCH] Komm. ut endel avgaatte maskiner. La til endel nye. La "--one-file-system --compress" til paa rsync-arg-listen. --- backup.sh | 133 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 94 insertions(+), 39 deletions(-) diff --git a/backup.sh b/backup.sh index d50abad..4f5bc6a 100755 --- a/backup.sh +++ b/backup.sh @@ -16,7 +16,7 @@ # -echo 'PVV; hjemmelaget backupscript ($Id: backup.sh,v 1.15 2025/05/24 17:20:56 root Exp root $)' +echo 'PVV; hjemmelaget backupscript ($Id: backup.sh,v 1.16 2025/05/24 17:22:00 root Exp root $)' echo echo $(date) @@ -79,7 +79,7 @@ echo "Starter backup..." #export RSYNC_RSH="ssh -c arcfour -v" export RSYNC_RSH="ssh -v" rsync="/usr/local/bin/rsync" -rsync_flags="--archive --hard-links --delete --numeric-ids --stats --inplace --relative --exclude=/.zfs/" +rsync_flags="--archive --hard-links --one-file-system --compress --delete --numeric-ids --stats --inplace --relative --exclude=/.zfs/" logdir="/backupz/log" # Gjør selve overføringen. @@ -98,40 +98,53 @@ echo echo -# knakelibrak (wiki) +# ameno +command="${rsync} ${rsync_flags} \ + --log-file=${logdir}/ameno.log.$snapshot \ + --exclude=/var/cache/ \ + --exclude=/var/lib/snapd/ \ + --exclude=/var/log/journal/ \ + ameno:/ \ + ameno:/boot/firmware \ + /backupz/ameno/current/" +$command >${logdir}/ameno.out.$snapshot 2>&1 & +venteproc="$venteproc $!" +echo "Startet $!: $command" + +# # knakelibrak (wiki) # command="${rsync} ${rsync_flags}\ # wiki:/var/lib/mediawiki /backupz/wiki/" # $command >${logdir}/wiki.out.$snapshot 2>&1 & # venteproc="$venteproc $!" # echo "Startet $!: $command" -# knakelibrak (databases) -command="${rsync} ${rsync_flags}\ - knakelibrak:/var/backups/databases /backupz/databases/" -$command >${logdir}/knakelibrak.out.$snapshot 2>&1 & -venteproc="$venteproc $!" -echo "Startet $!: $command" +# # knakelibrak (databases) +# command="${rsync} ${rsync_flags}\ +# knakelibrak:/var/backups/databases /backupz/databases/" +# $command >${logdir}/knakelibrak.out.$snapshot 2>&1 & +# venteproc="$venteproc $!" +# echo "Startet $!: $command" -# jokum (synapse) -command="${rsync} ${rsync_flags}\ - jokum:/data/synapse/ /backupz/jokum/synapse/" -$command >${logdir}/jokum.out.$snapshot 2>&1 & -venteproc="$venteproc $!" -echo "Startet $!: $command" +# # jokum (synapse) +# command="${rsync} ${rsync_flags}\ +# jokum:/data/synapse/ /backupz/jokum/synapse/" +# $command >${logdir}/jokum.out.$snapshot 2>&1 & +# venteproc="$venteproc $!" +# echo "Startet $!: $command" -# skrotnisse -command="${rsync} ${rsync_flags}\ - skrotnisse:/var/www/ skrotnisse:/srv/ /backupz/skrotnisse/" -$command >${logdir}/skrotnisse.out.$snapshot 2>&1 & -venteproc="$venteproc $!" -echo "Startet $!: $command" +# # skrotnisse +# command="${rsync} ${rsync_flags}\ +# skrotnisse:/var/www/ skrotnisse:/srv/ /backupz/skrotnisse/" +# $command >${logdir}/skrotnisse.out.$snapshot 2>&1 & +# venteproc="$venteproc $!" +# echo "Startet $!: $command" -# dash8 -command="${rsync} ${rsync_flags}\ - dash8:/var/lib/bitlbee/ /backupz/dash8/" -$command >${logdir}/dash8.out.$snapshot 2>&1 & -venteproc="$venteproc $!" -echo "Startet $!: $command" +# # dash8 +# command="${rsync} ${rsync_flags}\ +# dash8:/var/lib/bitlbee/ /backupz/dash8/" +# $command >${logdir}/dash8.out.$snapshot 2>&1 & +# venteproc="$venteproc $!" +# echo "Startet $!: $command" # tim døde, tom tok over men har ikke squirrelmail (4.feb 2019) # tim (web) @@ -143,27 +156,69 @@ echo "Startet $!: $command" # homepvv # Maa ha --one-file-system, ellers henger rsync pga. gvfs. -command="${rsync} ${rsync_flags} --one-file-system --exclude-from=/backupz/homepvv.exclude \ +command="${rsync} ${rsync_flags} \ --log-file=${logdir}/homepvv.log.$snapshot \ - homepvv:/ homepvv:/boot homepvv:/export/home/pvv homepvv:/var /backupz/homepvv/" + --exclude-from=/backupz/homepvv.exclude \ + homepvv:/ \ + homepvv:/boot \ + homepvv:/export/home/pvv \ + homepvv:/var \ + /backupz/homepvv/" $command >${logdir}/homepvv.out.$snapshot 2>&1 & venteproc="$venteproc $!" echo "Startet $!: $command" -# lommel -command="${rsync} ${rsync_flags} --exclude-from=/backupz/lommel.exclude \ - lommel:/ /backupz/lommel/" -$command >${logdir}/lommel.out.$snapshot 2>&1 & +# innovation +# Minecraft-verden kopieres fra /var/backups/minecraft/current/ istf. +# /srv/minecraft-pvv/. +command="${rsync} ${rsync_flags} \ + --log-file=${logdir}/innovation.log.$snapshot \ + --exclude=/srv/minecraft-pvv/ \ + --exclude=/var/cache/ \ + --exclude=/var/db/freebsd-update/files/ \ + innovation:/ \ + innovation:/boot/efi \ + /backupz/innovation/current/" +$command >${logdir}/innovation.out.$snapshot 2>&1 & venteproc="$venteproc $!" echo "Startet $!: $command" -# Spikkjeposche +# # lommel +# command="${rsync} ${rsync_flags} --exclude-from=/backupz/lommel.exclude \ +# lommel:/ /backupz/lommel/" +# $command >${logdir}/lommel.out.$snapshot 2>&1 & +# venteproc="$venteproc $!" +# echo "Startet $!: $command" + +# sleipner command="${rsync} ${rsync_flags} \ - spikkjeposche:/usr/local/www \ - spikkjeposche:/usr/local/etc/lighttpd \ - spikkjeposche:/etc/ssl/private \ - /backupz/spikkjeposche/" -$command >${logdir}/spikkjeposche.out.$snapshot 2>&1 & + --log-file=${logdir}/sleipner.log.$snapshot \ + --exclude=/scratch/ \ + --exclude=/var/cache/ \ + sleipner:/ \ + /backupz/sleipner/current/" +$command >${logdir}/sleipner.out.$snapshot 2>&1 & +venteproc="$venteproc $!" +echo "Startet $!: $command" + +# # Spikkjeposche +# command="${rsync} ${rsync_flags} \ +# spikkjeposche:/usr/local/www \ +# spikkjeposche:/usr/local/etc/lighttpd \ +# spikkjeposche:/etc/ssl/private \ +# /backupz/spikkjeposche/" +# $command >${logdir}/spikkjeposche.out.$snapshot 2>&1 & +# venteproc="$venteproc $!" +# echo "Startet $!: $command" + +# tom +command="${rsync} ${rsync_flags} \ + --log-file=${logdir}/tom.log.$snapshot \ + --exclude=/var/cache/ \ + tom:/ \ + tom:/boot/efi \ + /backupz/tom/current/" +$command >${logdir}/tom.out.$snapshot 2>&1 & venteproc="$venteproc $!" echo "Startet $!: $command"