diff --git a/backup.sh b/backup.sh index 52242023..1acdf845 100755 --- a/backup.sh +++ b/backup.sh @@ -34,19 +34,19 @@ rm -rf $temp_dir # suppr les fichiers non existant sur zamok # synchro journalière, switch par semaine week=$(date +%W) # numéro de la semaine -week_mod2=$(( $week % 2 )) +#week_mod2=$(( $week % 2 )) ## Sauvegarde du Site web et des News et du wiki -rsync -atzSHe ssh --delete $site_web backupcrans@pegase:~/backup-$week_mod2/httpd || exit 4 -rsync -atzSHe ssh --delete $news backupcrans@pegase:~/backup-$week_mod2/var/spool || exit 6 -rsync -atzSHe ssh --delete $wiki backupcrans@pegase:~/backup-$week_mod2/wiki || exit 7 -rsync -atzSHe ssh --delete $jabber backupcrans@pegase:~/backup-$week_mod2/jabber || exit 8 -rsync -atzSHe ssh --delete $mailman backupcrans@pegase:~/backup-$week_mod2/mailman || exit 9 +rsync -atzSHe ssh --delete $site_web backupcrans@pegase:~/backup-$week/httpd || exit 4 +rsync -atzSHe ssh --delete $news backupcrans@pegase:~/backup-$week/var/spool || exit 6 +rsync -atzSHe ssh --delete $wiki backupcrans@pegase:~/backup-$week/wiki || exit 7 +rsync -atzSHe ssh --delete $jabber backupcrans@pegase:~/backup-$week/jabber || exit 8 +rsync -atzSHe ssh --delete $mailman backupcrans@pegase:~/backup-$week/mailman || exit 9 ## Sauvegarde des mails # rsync change le atime quand il lit le fichier, on perd la date de dernière consultation des mails pour le ménage des comptes mount /var/spool/mail -o remount,noatime -rsync -atzSHe ssh --delete $mails backupcrans@pegase:~/backup-$week_mod2/var/spool || exit 5 +rsync -atzSHe ssh --delete $mails backupcrans@pegase:~/backup-$week/var/spool || exit 5 mount /var/spool/mail -o remount,atime ## Sauvegarde des homes @@ -54,7 +54,7 @@ mount /var/spool/mail -o remount,atime # "Permission denied" errors occur because backupcrans is not root on pegase. Ignoring temp=$(mktemp) temp_mail=$(mktemp) -rsync -atzSHe ssh --delete $homes backupcrans@pegase:~/backup-$week_mod2 &> $temp +rsync -atzSHe ssh --delete $homes backupcrans@pegase:~/backup-$week &> $temp cat $temp | grep -viEe "^((recv_generator)|(opendir)|(stat)).*Permission denied$" | grep -vie "^skipping non-regular file" | grep -vie "^rsync error: some files could not be transferred" | grep -vie "^file has vanished" > $temp_mail if [ -s $temp_mail ] then