free
/
freedombone
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

Removing old backups

Bob Mottram 10 vuotta sitten
vanhempi
849ce0c276
commit
4f8df6ee33
1 muutettua tiedostoa jossa 13 lisäystä ja 13 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 13
    13
      install-freedombone.sh

+ 13
- 13
install-freedombone.sh Näytä tiedosto 

@@ -636,58 +636,58 @@ function create_backup_script {
636 636 
   echo '# Backup the public mailing list' >> /usr/bin/$BACKUP_SCRIPT_NAME
637 637 
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
638 638 
   echo '  echo "Backing up the public mailing list"' >> /usr/bin/$BACKUP_SCRIPT_NAME
639 
-  echo -n '  duplicity full remove-all-but-n-full 3 --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
639 
+  echo -n '  duplicity full --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
640 640 
   echo "$PUBLIC_MAILING_LIST_DIRECTORY file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
641 641 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
642 642 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
643 643 
   echo '# Backup xmpp settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
644 644 
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
645 645 
   echo '  echo "Backing up the XMPP settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
646 
-  echo -n '  duplicity full remove-all-but-n-full 3 --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
646 
+  echo -n '  duplicity full --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
647 647 
   echo "$XMPP_DIRECTORY file://$USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
648 648 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
649 649 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
650 650 
   echo '# Backup web content and other stuff' >> /usr/bin/$BACKUP_SCRIPT_NAME
651 651 
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
652 652 
   echo '  echo "Backing up web content and miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
653 
-  echo -n '  duplicity full remove-all-but-n-full 3 --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
653 
+  echo -n '  duplicity full --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
654 654 
   echo "/home/$MY_USERNAME/tempfiles file://$USB_MOUNT/backup/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
655 655 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
656 656 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
657 657 
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
658 658 
   echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
659 659 
   echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
660 
-  echo -n '  duplicity full remove-all-but-n-full 3 --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
660 
+  echo -n '  duplicity full --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
661 661 
   echo "/home/$MY_USERNAME/Maildir file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
662 662 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
663 663 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
664 664 
   echo '# Backup DLNA cache' >> /usr/bin/$BACKUP_SCRIPT_NAME
665 665 
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
666 666 
   echo '  echo "Backing up DLNA cache"' >> /usr/bin/$BACKUP_SCRIPT_NAME
667 
-  echo -n '  duplicity full remove-all-but-n-full 3 --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
667 
+  echo -n '  duplicity full --encrypt-key $GPG_KEY --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
668 668 
   echo "/var/cache/minidlna file://$USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
669 669 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
670 670
671 671 
   echo 'echo "Cleaning up backup files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
672 672 
   echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
673 
-  echo "  duplicity full remove-all-but-n-full 3 --force cleanup file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
673 
+  echo "  duplicity full --force cleanup file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
674 674 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
675 675 
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
676 
-  echo "  duplicity full remove-all-but-n-full 3 --force cleanup file://$USB_MOUNT/backup/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
676 
+  echo "  duplicity full --force cleanup file://$USB_MOUNT/backup/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
677 677 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
678 678 
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
679 
-  echo "  duplicity full remove-all-but-n-full 3 --force cleanup file://$USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
679 
+  echo "  duplicity full --force cleanup file://$USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
680 680 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
681 681 
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
682 
-  echo "  duplicity full remove-all-but-n-full 3 --force cleanup file://$USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
682 
+  echo "  duplicity full --force cleanup file://$USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
683 683 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
684 684 
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
685 
-  echo "  duplicity full remove-all-but-n-full 3 --force cleanup file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
685 
+  echo "  duplicity full --force cleanup file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
686 686 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
687 687
688 688 
   echo 'echo "Removing old backups"' >> /usr/bin/$BACKUP_SCRIPT_NAME
689 689 
   echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
690 
-  echo "  duplicity full remove-all-but-n-full 3 --force remove-all-but-n-full 2 file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
690 
+  echo "  duplicity full --force remove-all-but-n-full 3 file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
691 691 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
692 692 
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
693 693 
   echo "  duplicity full --force remove-all-but-n-full 3 file://$USB_MOUNT/backup/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -699,7 +699,7 @@ function create_backup_script {
699 699 
   echo "  duplicity full --force remove-all-but-n-full 3 file://$USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
700 700 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
701 701 
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
702 
-  echo "  duplicity full --force remove-all-but-n-full 2 file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
702 
+  echo "  duplicity full --force remove-all-but-n-full 3 file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
703 703 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
704 704
705 705 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -974,7 +974,7 @@ function backup_to_friends_servers {
974 974 
   echo "    duplicity full --ssh-askpass --force remove-all-but-n-full 3 $SERVER/Maildir" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
975 975 
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
976 976 
   echo "  if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
977 
-  echo "    duplicity full --ssh-askpass --force remove-all-but-n-full 2
977 
+  echo "    duplicity full --ssh-askpass --force remove-all-but-n-full 3
978 978 
 3 $SERVER/tempfiles" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
979 979 
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
980 980 
   echo "  if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME