diff -u backup.orig/home-full.sh ./home-full.sh --- backup.orig/home-full.sh 2005-04-06 19:52:44.000000000 +0200 +++ backup/home-full.sh 2005-04-07 04:29:29.000000000 +0200 @@ -1,22 +1,24 @@ #!/bin/sh # -# home-full.sh v1.1a +# home-full.sh v1.3 # TiChou BACKUPDIR="/data/backup" MONTH="`date +%m`" -OLDMONTH="`date -d '-2 month' +%m`" +OLDMONTH="`date -d '2 month ago' +%m`" umask 037 # /home -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=0 -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='lost+found{%!/*}' \ - -pat='*/.maildir{%!-*}/{%!.*/}*/*' \ - -pat='*/{M!m}ail/*' \ - -C /home . > "$BACKUPDIR"/archives/home-full-month-$MONTH.tar.gz +ARCHIVE="$BACKUPDIR"/archives/home-full-month-$MONTH.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=0 tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='lost+found{%!/*}' \ + pat='*/.maildir{%!-*}/{%!.*/}*/*' \ + pat='*/{M!m}ail/*' \ + C=/home . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 -rm -f "$BACKUPDIR"/archives/*-full-month-$OLDMONTH.tar.gz +rm -f "$BACKUPDIR"/archives/home-full-month-$OLDMONTH.tar.gz{,.md5} diff -u backup.orig/home-incremental.sh ./home-incremental.sh --- backup.orig/home-incremental.sh 2005-04-06 19:52:44.000000000 +0200 +++ backup/home-incremental.sh 2005-04-07 04:23:27.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # -# home-incremental.sh v1.1a +# home-incremental.sh v1.3 # TiChou BACKUPDIR="/data/backup" @@ -11,10 +11,12 @@ umask 037 # /home -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=$LEVEL -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='lost+found{%!/*}' \ - -pat='*/.maildir{%!/*}' \ - -pat='*/{M!m}ail{%!/*}' \ - -C /home . > "$BACKUPDIR"/archives/home-inc-level-$LEVEL.tar.gz +ARCHIVE="$BACKUPDIR"/archives/home-inc-level-$LEVEL.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=$LEVEL tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='lost+found{%!/*}' \ + pat='*/.maildir{%!/*}' \ + pat='*/{M!m}ail{%!/*}' \ + C=/home . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 diff -u backup.orig/mail-full.sh ./mail-full.sh --- backup.orig/mail-full.sh 2005-04-06 19:56:36.000000000 +0200 +++ backup/mail-full.sh 2005-04-07 04:29:42.000000000 +0200 @@ -1,22 +1,24 @@ #!/bin/sh # -# mail-full.sh v1.2a +# mail-full.sh v1.4 # TiChou BACKUPDIR="/data/backup" MONTH="`date +%m`" -OLDMONTH="`date -d '-2 month' +%m`" +OLDMONTH="`date -d '2 month ago' +%m`" umask 037 # mail +ARCHIVE="$BACKUPDIR"/archives/mail-full-month-$MONTH.tar.gz touch "$BACKUPDIR"/conf/mailstamp -star cz -sparse -link-dirs -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ +star -cz -sparse -link-dirs -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ -dump \ - -pat='*/.maildir{%!-*}/*' \ - -pat='*/{M!m}ail/*' \ - -C / /home/*/{.maildir*,mail,Mail} /var/vpopmail/domains /var/qmail/alias > "$BACKUPDIR"/archives/mail-full-month-$MONTH.tar.gz + pat='*/.maildir{%!-*}/*' \ + pat='*/{M!m}ail/*' \ + C=/ /home/*/{.maildir*,mail,Mail} /var/vpopmail/domains /var/qmail/alias > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 -rm -f "$BACKUPDIR"/archives/mail-full-month-$OLDMONTH.tar.gz +rm -f "$BACKUPDIR"/archives/mail-full-month-$OLDMONTH.tar.gz{,.md5} diff -u backup.orig/mail-incremental.sh ./mail-incremental.sh --- backup.orig/mail-incremental.sh 2005-04-06 19:56:36.000000000 +0200 +++ backup/mail-incremental.sh 2005-04-08 01:58:59.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # -# mail-incremental.sh v1.2a +# mail-incremental.sh v1.4a # TiChou BACKUPDIR="/data/backup" @@ -11,8 +11,13 @@ umask 037 # mail -star cz -sparse -link-dirs -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -dump -newer="$BACKUPDIR"/conf/mailstamp \ - -pat='*/.maildir{%!-*}/*' -pat='*/{M!m}ail/*' \ - -C / /home/*/{.maildir*,mail,Mail} /var/vpopmail/domains /var/qmail/alias > "$BACKUPDIR"/archives/mail-inc-level-$LEVEL.tar.gz +ARCHIVE="$BACKUPDIR"/archives/mail-inc-level-$LEVEL.tar.gz +touch "$BACKUPDIR"/conf/mailstamp.start +star -cz -sparse -link-dirs -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + -dump newer="$BACKUPDIR"/conf/mailstamp \ + pat='*/.maildir{%!-*}/*' \ + pat='*/{M!m}ail/*' \ + C=/ /home/*/{.maildir*,mail,Mail} /var/vpopmail/domains /var/qmail/alias > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 +mv "$BACKUPDIR"/conf/mailstamp.start "$BACKUPDIR"/conf/mailstamp diff -u backup.orig/mysql-full.sh ./mysql-full.sh --- backup.orig/mysql-full.sh 2005-04-06 18:38:39.000000000 +0200 +++ backup/mysql-full.sh 2005-04-07 04:29:15.000000000 +0200 @@ -1,21 +1,27 @@ #!/bin/sh # -# mysql-full.sh v1.0 +# mysql-full.sh v1.1 # TiChou BACKUPDIR="/data/backup" USER="root" -PASS="foobar" +PASS="foobar" WEEK="`date +%U`" -OLDWEEK="`date -d '-4 week' +%U`" +OLDWEEK="`date -d '4 week ago' +%U`" umask 037 # mysql / log-bin in my.cnf mkdir -p "$BACKUPDIR"/mysql -mysqlhotcopy --user="$USER" --password="$PASS" --socket=/var/run/mysqld/mysqld.sock --regexp=".*" --allowold --resetmaster --quiet "$BACKUPDIR"/mysql -star cz -fifo -no-statistics -silent -C "$BACKUPDIR" -not -pat='mysql' mysql > "$BACKUPDIR"/archives/sql-full-week-$WEEK.tar.gz +mysqlhotcopy --user="$USER" --password="$PASS" --socket=/var/run/mysqld/mysqld.sock \ + --regexp=".*" --allowold --resetmaster --quiet "$BACKUPDIR"/mysql +ARCHIVE="$BACKUPDIR"/archives/sql-full-week-$WEEK.tar.gz +star -cz -sparse -fifo \ + -no-statistics -silent \ + -not pat='mysql' \ + C="$BACKUPDIR" mysql > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 rm -rf "$BACKUPDIR"/mysql -rm -f "$BACKUPDIR"/archives/sql-full-week-$OLDWEEK.tar.gz +rm -f "$BACKUPDIR"/archives/sql-full-week-$OLDWEEK.tar.gz{,.md5} diff -u backup.orig/mysql-incremental.sh ./mysql-incremental.sh --- backup.orig/mysql-incremental.sh 2005-04-06 18:38:49.000000000 +0200 +++ backup/mysql-incremental.sh 2005-04-07 04:28:29.000000000 +0200 @@ -5,7 +5,7 @@ BACKUPDIR="/data/backup" USER="root" -PASS="foobar" +PASS="foobar" DAY="`date +%w`" HOST="`hostname`" @@ -15,4 +15,6 @@ # mysql / log-bin in my.cnf BINLOG="/var/lib/mysql/`tail -n 1 /var/lib/mysql/$HOST-bin.index`" echo 'FLUSH LOGS;' | mysql --user="$USER" --password="$PASS" --socket=/var/run/mysqld/mysqld.sock -gzip -c9 "$BINLOG" > "$BACKUPDIR"/archives/sql-inc-day-$DAY.gz +ARCHIVE="$BACKUPDIR"/archives/sql-inc-day-$DAY.gz +gzip -c9 "$BINLOG" > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 diff -u backup.orig/system-full.sh ./system-full.sh --- backup.orig/system-full.sh 2005-04-06 19:48:24.000000000 +0200 +++ backup/system-full.sh 2005-04-07 19:55:49.000000000 +0200 @@ -1,55 +1,65 @@ #!/bin/sh # -# system-full.sh v1.2a +# system-full.sh v1.4a # TiChou BACKUPDIR="/data/backup" WEEK="`date +%U`" -OLDWEEK="`date -d '-4 week' +%U`" +OLDWEEK="`date -d '4 week ago' +%U`" umask 037 # / -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=0 -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -C / . > "$BACKUPDIR"/archives/root-full-week-$WEEK.tar.gz +ARCHIVE="$BACKUPDIR"/archives/root-full-week-$WEEK.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=0 tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + C=/ . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /usr -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=0 -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='portage/*' \ - -pat='{%!local/}src/*' \ - -C /usr . > "$BACKUPDIR"/archives/usr-full-week-$WEEK.tar.gz +ARCHIVE="$BACKUPDIR"/archives/usr-full-week-$WEEK.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=0 tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='portage/*' \ + pat='{%!local/}src/*' \ + C=/usr . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /var -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=0 -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='cache/{apache{%!-mm}!samba!edb/dep}/*' \ - -pat='qmail/{queue!alias}/*/*/*' \ - -pat='run/*.*' \ - -pat='spool/qmailscan/{{quarantine/*!working}/*!tmp}/*' \ - -pat='tmp/*' \ - -pat='vpopmail/domains/*/*/.maildir/*/*' \ - -pat='lib/mysql/*' \ - -C /var . > "$BACKUPDIR"/archives/var-full-week-$WEEK.tar.gz +ARCHIVE="$BACKUPDIR"/archives/var-full-week-$WEEK.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=0 tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='cache/{apache{%!-mm}!samba!edb/dep}/*' \ + pat='qmail/{queue!alias}/*/*/*' \ + pat='run/*.*' \ + pat='spool/qmailscan/{{quarantine/*!working}/*!tmp}/*' \ + pat='tmp/*' \ + pat='vpopmail/domains/*/*/.maildir/*/*' \ + pat='lib/mysql/*' \ + C=/var . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /opt -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=0 -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -C /opt . > "$BACKUPDIR"/archives/opt-full-week-$WEEK.tar.gz +ARCHIVE="$BACKUPDIR"/archives/opt-full-week-$WEEK.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=0 tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + C=/opt . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /srv -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=0 -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='games{%!/*}' \ - -pat='named/var/bind/sec/*' \ - -pat='*/var/run/*.*' \ - -C /srv . > "$BACKUPDIR"/archives/srv-full-week-$WEEK.tar.gz +ARCHIVE="$BACKUPDIR"/archives/srv-full-week-$WEEK.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=0 tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='games{%!/*}' \ + pat='named/var/bind/sec/*' \ + pat='*/var/run/*.*' \ + C=/srv . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 -rm -f "$BACKUPDIR"/archives/{root,usr,var,opt,srv}-full-week-$OLDWEEK.tar.gz +rm -f "$BACKUPDIR"/archives/{root,usr,var,opt,srv}-full-week-$OLDWEEK.tar.gz{,.md5} diff -u backup.orig/system-incremental.sh ./system-incremental.sh --- backup.orig/system-incremental.sh 2005-04-06 19:48:24.000000000 +0200 +++ backup/system-incremental.sh 2005-04-07 04:21:22.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # -# system-incremental.sh v1.2a +# system-incremental.sh v1.4 # TiChou BACKUPDIR="/data/backup" @@ -11,45 +11,55 @@ umask 037 # / -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=$DAY -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='{data!tmp}' \ - -C / . > "$BACKUPDIR"/archives/root-inc-day-$DAY.tar.gz +ARCHIVE="$BACKUPDIR"/archives/root-inc-day-$DAY.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=$DAY tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='{data!tmp}' \ + C=/ . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /usr -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=$DAY -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='portage{%!/*}' \ - -pat='{%!local/}src{%!/*}' \ - -pat='{%!local/}share/man/whatis' \ - -C /usr . > "$BACKUPDIR"/archives/usr-inc-day-$DAY.tar.gz +ARCHIVE="$BACKUPDIR"/archives/usr-inc-day-$DAY.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=$DAY tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='portage{%!/*}' \ + pat='{%!local/}src{%!/*}' \ + pat='{%!local/}share/man/whatis' \ + C=/usr . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /var -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=$DAY -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='cache/{apache{%!-mm}!samba!edb/dep}{%!/*}' \ - -pat='qmail/{queue!alias/.*/*}{%!/*}' \ - -pat='vpopmail/domains/*/*/.maildir{%!/*}' \ - -pat='spool/qmailscan/{archive!quarantine!tmp!working}{%!/*}' \ - -pat='{lock!run!tmp}{%!/*}' \ - -pat='lib/{mysql!slocate!init.d/started}{%!/*}' \ - -C /var . > "$BACKUPDIR"/archives/var-inc-day-$DAY.tar.gz +ARCHIVE="$BACKUPDIR"/archives/var-inc-day-$DAY.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=$DAY tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='cache/{apache{%!-mm}!samba!edb/dep}{%!/*}' \ + pat='qmail/{queue!alias/.*/*}{%!/*}' \ + pat='vpopmail/domains/*/*/.maildir{%!/*}' \ + pat='spool/qmailscan/{archive!quarantine!tmp!working}{%!/*}' \ + pat='{lock!run!tmp}{%!/*}' \ + pat='lib/{mysql!slocate!init.d/started}{%!/*}' \ + C=/var . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /opt -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=$DAY -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='f-prot/*.DEF' \ - -C /opt . > "$BACKUPDIR"/archives/opt-inc-day-$DAY.tar.gz +ARCHIVE="$BACKUPDIR"/archives/opt-inc-day-$DAY.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=$DAY tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='f-prot/*.DEF' \ + C=/opt . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5 # /srv -star cz -artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ - -no-statistics -silent -errctl="$BACKUPDIR"/conf/errctl \ - -level=$DAY -tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ - -not -pat='games{%!/*}' \ - -pat='named/var/bind/sec{%!/*}' \ - -pat='*/var/{lock!run!tmp}{%!/*}' \ - -C /srv . > "$BACKUPDIR"/archives/srv-inc-day-$DAY.tar.gz +ARCHIVE="$BACKUPDIR"/archives/srv-inc-day-$DAY.tar.gz +star -cz artype=exustar -acl -xattr -sparse -link-dirs -xdev -fifo \ + -no-statistics -silent errctl="$BACKUPDIR"/conf/errctl \ + level=$DAY tardumps="$BACKUPDIR"/conf/tardumps -wtardumps \ + -not pat='games{%!/*}' \ + pat='named/var/bind/sec{%!/*}' \ + pat='*/var/{lock!run!tmp}{%!/*}' \ + C=/srv . > "$ARCHIVE" +md5sum "$ARCHIVE" > "$ARCHIVE".md5