free
/
freedombone
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 0 Wiki Activity
Sfoglia il codice sorgente

Check that databases get backed up

Bob Mottram 10 anni fa
parent
b2469eb095
commit
a99afe0813
1 ha cambiato i file con 40 aggiunte e 28 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 40
    28
      install-freedombone.sh

+ 40
- 28
install-freedombone.sh Vedi File 

@@ -581,8 +581,12 @@ function create_backup_script {
581 581 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
582 582 
       echo 'echo "Obtaining GNU Social database backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
583 583 
       echo "mysqldump --password=$MARIADB_PASSWORD gnusocial > $USB_MOUNT/backup/gnusocial.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
584 
+      echo "if [ ! -s $USB_MOUNT/backup/gnusocial.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
585 
+      echo '  echo "GNU social database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
586 
+      echo '  exit 379' >> /usr/bin/$BACKUP_SCRIPT_NAME
587 
+      echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
584 588 
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
585 
-      echo "rsyncrypto -r /var/www/$MICROBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/gnusocial $USB_MOUNT/backup/gnusocial.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
589 
+      echo "rsyncrypto -v -r /var/www/$MICROBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/gnusocial $USB_MOUNT/backup/gnusocial.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
586 590 
   fi
587 591 
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
588 592 
       echo "if [ ! -d $USB_MOUNT/backup/redmatrix ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -590,30 +594,38 @@ function create_backup_script {
590 594 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
591 595 
       echo 'echo "Obtaining Red Matrix database backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
592 596 
       echo "mysqldump --password=$MARIADB_PASSWORD redmatrix > $USB_MOUNT/backup/redmatrix.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
597 
+      echo "if [ ! -s $USB_MOUNT/backup/redmatrix.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
598 
+      echo '  echo "Red Matrix database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
599 
+      echo '  exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
600 
+      echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
593 601 
       echo 'echo "Backing up Red Matrix installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
594 
-      echo "rsyncrypto -r /var/www/$REDMATRIX_DOMAIN_NAME/htdocs $USB_MOUNT/backup/redmatrix $USB_MOUNT/backup/redmatrix.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
602 
+      echo "rsyncrypto -v -r /var/www/$REDMATRIX_DOMAIN_NAME/htdocs $USB_MOUNT/backup/redmatrix $USB_MOUNT/backup/redmatrix.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
595 603 
   fi
596 604 
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
597 605 
       echo "if [ ! -d $USB_MOUNT/backup/owncloud ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
598 606 
       echo "  mkdir -p $USB_MOUNT/backup/owncloud" >> /usr/bin/$BACKUP_SCRIPT_NAME
599 607 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
600 608 
       echo "mysqldump --password=$MARIADB_PASSWORD owncloud > $USB_MOUNT/backup/owncloud.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
609 
+      echo "if [ ! -s $USB_MOUNT/backup/owncloud.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
610 
+      echo '  echo "Owncloud database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
611 
+      echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
612 
+      echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
601 613 
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
602 
-      echo "rsyncrypto -r /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs $USB_MOUNT/backup/owncloud $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
614 
+      echo "rsyncrypto -v -r /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs $USB_MOUNT/backup/owncloud $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
603 615 
   fi
604 616 
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
605 617 
       echo "if [ ! -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
606 618 
       echo "  mkdir -p $USB_MOUNT/backup/wiki" >> /usr/bin/$BACKUP_SCRIPT_NAME
607 619 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
608 620 
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
609 
-      echo "rsyncrypto -r /var/www/$WIKI_DOMAIN_NAME/htdocs $USB_MOUNT/backup/wiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
621 
+      echo "rsyncrypto -v -r /var/www/$WIKI_DOMAIN_NAME/htdocs $USB_MOUNT/backup/wiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
610 622 
   fi
611 623 
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
612 624 
       echo "if [ ! -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
613 625 
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
614 626 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
615 627 
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
616 
-      echo "rsyncrypto -r /var/www/$FULLBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backupblog $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
628 
+      echo "rsyncrypto -v -r /var/www/$FULLBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backupblog $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
617 629 
   fi
618 630 
   echo 'echo "Archiving miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
619 631 
   echo "tar -czvf /home/$MY_USERNAME/tempfiles/miscfiles.tar.gz /home/$MY_USERNAME/.gnupg /home/$MY_USERNAME/.muttrc /home/$MY_USERNAME/.procmailrc /home/$MY_USERNAME/.ssh /var/lib/mysql/mysql /etc/nginx/sites-available /home/$MY_USERNAME/README" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -625,7 +637,7 @@ function create_backup_script {
625 637 
   echo "  if [ ! -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
626 638 
   echo "    mkdir -p $USB_MOUNT/backup/ssl" >> /usr/bin/$BACKUP_SCRIPT_NAME
627 639 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
628 
-  echo "  rsyncrypto  -r /etc/ssl $USB_MOUNT/backup/ssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
640 
+  echo "  rsyncrypto  -v -r /etc/ssl $USB_MOUNT/backup/ssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
629 641 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
630 642 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
631 643 
   echo '# Backup projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -634,7 +646,7 @@ function create_backup_script {
634 646 
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
635 647 
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
636 648 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
637 
-  echo "  rsyncrypto  -r /home/$MY_USERNAME/projects $USB_MOUNT/backup/projects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
649 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/projects $USB_MOUNT/backup/projects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
638 650 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
639 651 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
640 652 
   echo '# Backup personal settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -643,7 +655,7 @@ function create_backup_script {
643 655 
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
644 656 
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
645 657 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
646 
-  echo "  rsyncrypto  -r /home/$MY_USERNAME/personal $USB_MOUNT/backup/personal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
658 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/personal $USB_MOUNT/backup/personal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
647 659 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
648 660 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
649 661 
   echo '# Backup the public mailing list' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -652,7 +664,7 @@ function create_backup_script {
652 664 
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
653 665 
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
654 666 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
655 
-  echo "  rsyncrypto  -r $PUBLIC_MAILING_LIST_DIRECTORY $USB_MOUNT/backup/mailinglist $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
667 
+  echo "  rsyncrypto  -v -r $PUBLIC_MAILING_LIST_DIRECTORY $USB_MOUNT/backup/mailinglist $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
656 668 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
657 669 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
658 670 
   echo '# Backup xmpp settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -661,7 +673,7 @@ function create_backup_script {
661 673 
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
662 674 
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
663 675 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
664 
-  echo "  rsyncrypto  -r $XMPP_DIRECTORY $USB_MOUNT/backup/xmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
676 
+  echo "  rsyncrypto  -v -r $XMPP_DIRECTORY $USB_MOUNT/backup/xmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
665 677 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
666 678 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
667 679 
   #echo '# Backup web content' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -669,7 +681,7 @@ function create_backup_script {
669 681 
   #echo "if [ ! -d $USB_MOUNT/backup/www ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
670 682 
   #echo "  mkdir -p $USB_MOUNT/backup/www" >> /usr/bin/$BACKUP_SCRIPT_NAME
671 683 
   #echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
672 
-  #echo "rsyncrypto  -r /var/www $USB_MOUNT/backup/www $USB_MOUNT/backup/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
684 
+  #echo "rsyncrypto  -v -r /var/www $USB_MOUNT/backup/www $USB_MOUNT/backup/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
673 685 
   #echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
674 686 
   echo '# Backup other stuff' >> /usr/bin/$BACKUP_SCRIPT_NAME
675 687 
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -677,7 +689,7 @@ function create_backup_script {
677 689 
   echo "  if [ ! -d $USB_MOUNT/backup/misc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
678 690 
   echo "    mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
679 691 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
680 
-  echo "  rsyncrypto  -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
692 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
681 693 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
682 694 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
683 695 
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -686,7 +698,7 @@ function create_backup_script {
686 698 
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
687 699 
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
688 700 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
689 
-  echo "  rsyncrypto  -r /home/$MY_USERNAME/Maildir $USB_MOUNT/backup/mail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
701 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/Maildir $USB_MOUNT/backup/mail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
690 702 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
691 703 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
692 704 
   echo '# Backup DLNA cache' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -695,7 +707,7 @@ function create_backup_script {
695 707 
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
696 708 
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
697 709 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
698 
-  echo "  rsyncrypto  -r /var/cache/minidlna $USB_MOUNT/backup/dlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
710 
+  echo "  rsyncrypto  -v -r /var/cache/minidlna $USB_MOUNT/backup/dlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
699 711 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
700 712
701 713 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -766,31 +778,31 @@ function create_restore_script {
766 778
767 779 
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
768 780 
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
769 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/ssl /etc/ssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
781 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/ssl /etc/ssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
770 782 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
771 783 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
772 784
773 785 
   echo "if [ -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
774 786 
   echo '  echo "Restoring projects"' >> /usr/bin/$RESTORE_SCRIPT_NAME
775 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/projects /home/$MY_USERNAME/projects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
787 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/projects /home/$MY_USERNAME/projects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
776 788 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
777 789 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
778 790
779 791 
   echo "if [ -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
780 792 
   echo '  echo "Restoring personal settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
781 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/personal /home/$MY_USERNAME/personal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
793 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/personal /home/$MY_USERNAME/personal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
782 794 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
783 795 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
784 796
785 797 
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
786 798 
   echo '  echo "Restoring public mailing list"' >> /usr/bin/$RESTORE_SCRIPT_NAME
787 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/mailinglist $PUBLIC_MAILING_LIST_DIRECTORY $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
799 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mailinglist $PUBLIC_MAILING_LIST_DIRECTORY $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
788 800 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
789 801 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
790 802
791 803 
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
792 804 
   echo '  echo "Restoring XMPP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
793 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/xmpp $XMPP_DIRECTORY $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
805 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/xmpp $XMPP_DIRECTORY $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
794 806 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
795 807 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
796 808 
 
@@ -802,11 +814,11 @@ function create_restore_script {
802 814 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
803 815
804 816 
   #echo 'echo "Restoring web content"' >> /usr/bin/$RESTORE_SCRIPT_NAME
805 
-  #echo "rsyncrypto -d -r $USB_MOUNT/backup/www /var/www $USB_MOUNT/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
817 
+  #echo "rsyncrypto -v -d -r $USB_MOUNT/backup/www /var/www $USB_MOUNT/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
806 818 
   #echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
807 819
808 820 
   echo 'echo "Restoring miscellaneous files"' >> /usr/bin/$RESTORE_SCRIPT_NAME
809 
-  echo "rsyncrypto -d -r $USB_MOUNT/backup/misc /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
821 
+  echo "rsyncrypto -v -d -r $USB_MOUNT/backup/misc /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
810 822 
   echo "tar -xzvf /home/$MY_USERNAME/tempfiles/miscfiles.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
811 823 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
812 824 
 
@@ -815,7 +827,7 @@ function create_restore_script {
815 827 
       echo '  echo "Restoring microblog database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
816 828 
       echo "  mysql -u root --password=$MARIADB_PASSWORD gnusocial -o < $USB_MOUNT/backup/gnusocial.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
817 829 
       echo '  echo "Restoring microblog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
818 
-      echo "  rsyncrypto -d -r $USB_MOUNT/backup/gnusocial /var/www/$MICROBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/gnusocial.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
830 
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/gnusocial /var/www/$MICROBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/gnusocial.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
819 831 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
820 832 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
821 833 
   fi
 
@@ -825,7 +837,7 @@ function create_restore_script {
825 837 
       echo '  echo "Restoring Red Matrix database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
826 838 
       echo "  mysql -u root --password=$MARIADB_PASSWORD redmatrix -o < $USB_MOUNT/backup/redmatrix.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
827 839 
       echo '  echo "Restoring Red Matrix installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
828 
-      echo "  rsyncrypto -d -r $USB_MOUNT/backup/redmatrix /var/www/$REDMATRIX_DOMAIN_NAME/htdocs $USB_MOUNT/backup/redmatrix.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
840 
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/redmatrix /var/www/$REDMATRIX_DOMAIN_NAME/htdocs $USB_MOUNT/backup/redmatrix.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
829 841 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
830 842 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
831 843 
   fi
 
@@ -835,7 +847,7 @@ function create_restore_script {
835 847 
       echo '  echo "Restoring owncloud database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
836 848 
       echo "  mysql -u root --password=$MARIADB_PASSWORD owncloud -o < $USB_MOUNT/backup/owncloud.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
837 849 
       echo '  echo "Restoring Owncloud installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
838 
-      echo "  rsyncrypto -d -r $USB_MOUNT/backup/owncloud /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
850 
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/owncloud /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
839 851 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
840 852 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
841 853 
   fi
 
@@ -843,7 +855,7 @@ function create_restore_script {
843 855 
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
844 856 
       echo "if [ -f /home/$MY_USERNAME/tempfiles/wiki.tar.gz ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
845 857 
       echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
846 
-      echo "  rsyncrypto -d -r $USB_MOUNT/backup/wiki /var/www/$WIKI_DOMAIN_NAME/htdocs $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
858 
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/wiki /var/www/$WIKI_DOMAIN_NAME/htdocs $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
847 859 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
848 860 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
849 861 
   fi
 
@@ -851,7 +863,7 @@ function create_restore_script {
851 863 
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
852 864 
       echo "if [ -f /home/$MY_USERNAME/tempfiles/blog.tar.gz ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
853 865 
       echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
854 
-      echo "  rsyncrypto -d -r $USB_MOUNT/backup/blog /var/www/$FULLBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
866 
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/blog /var/www/$FULLBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
855 867 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
856 868 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
857 869 
   fi
 
@@ -862,13 +874,13 @@ function create_restore_script {
862 874
863 875 
   echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
864 876 
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
865 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/mail /home/$MY_USERNAME/Maildir $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
877 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mail /home/$MY_USERNAME/Maildir $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
866 878 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
867 879 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
868 880
869 881 
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
870 882 
   echo '  echo "Restoring DLNA cache"' >> /usr/bin/$RESTORE_SCRIPT_NAME
871 
-  echo "  rsyncrypto -d -r $USB_MOUNT/backup/dlna /var/cache/minidlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
883 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/dlna /var/cache/minidlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
872 884 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
873 885 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
874 886