free
/
freedombone
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

Increased checking during backup

Bob Mottram hace 10 años
padre
dde22c31d5
commit
aac0cdce05
Se han modificado 1 ficheros con 92 adiciones y 2 borrados
Dividir vista Mostrar estadísticas de diff
  1. 92
    2
      install-freedombone.sh

+ 92
- 2
install-freedombone.sh Ver fichero 

@@ -636,13 +636,23 @@ function create_backup_script {
636 636 
       echo '  rm -rf /root/tempgnusocialdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
637 637 
       echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
638 638 
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
639 
-      echo '  exit 379' >> /usr/bin/$BACKUP_SCRIPT_NAME
639 
+      echo '  exit 296' >> /usr/bin/$BACKUP_SCRIPT_NAME
640 640 
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
641 641 
       echo "rsyncrypto -v -r /root/tempgnusocialdata $USB_MOUNT/backup/gnusocialdata $USB_MOUNT/backup/gnusocialdata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
642 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
643 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
644 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
645 
+      echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
646 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
642 647 
       echo 'shred -zu /root/tempgnusocialdata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
643 648 
       echo 'rm -rf /root/tempgnusocialdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
644 649 
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
645 650 
       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
651 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
652 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
653 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
654 
+      echo '  exit 846' >> /usr/bin/$BACKUP_SCRIPT_NAME
655 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
646 656 
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
647 657 
   fi
648 658 
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
 
@@ -670,10 +680,20 @@ function create_backup_script {
670 680 
       echo '  exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
671 681 
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
672 682 
       echo "rsyncrypto -v -r /root/tempredmatrixdata $USB_MOUNT/backup/redmatrixdata $USB_MOUNT/backup/redmatrixdata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
683 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
684 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
685 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
686 
+      echo '   exit 285' >> /usr/bin/$BACKUP_SCRIPT_NAME
687 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
673 688 
       echo 'shred -zu /root/tempredmatrixdata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
674 689 
       echo 'rm -rf /root/tempredmatrixdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
675 690 
       echo 'echo "Backing up Red Matrix installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
676 691 
       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
692 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
693 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
694 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
695 
+      echo '   exit 593' >> /usr/bin/$BACKUP_SCRIPT_NAME
696 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
677 697 
   fi
678 698 
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
679 699 
       BACKUP_INCLUDES_DATABASES="yes"
 
@@ -699,10 +719,20 @@ function create_backup_script {
699 719 
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
700 720 
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
701 721 
       echo "rsyncrypto -v -r /root/tempownclouddata $USB_MOUNT/backup/ownclouddata $USB_MOUNT/backup/ownclouddata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
722 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
723 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
724 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
725 
+      echo '   exit 188' >> /usr/bin/$BACKUP_SCRIPT_NAME
726 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
702 727 
       echo 'shred -zu /root/tempownclouddata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
703 728 
       echo 'rm -rf /root/tempownclouddata' >> /usr/bin/$BACKUP_SCRIPT_NAME
704 729 
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
705 730 
       echo "rsyncrypto -v -r /var/lib/owncloud $USB_MOUNT/backup/owncloud $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
731 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
732 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
733 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
734 
+      echo '  exit 632' >> /usr/bin/$BACKUP_SCRIPT_NAME
735 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
706 736 
   fi
707 737 
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
708 738 
       echo "if [ ! -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -710,6 +740,11 @@ function create_backup_script {
710 740 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
711 741 
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
712 742 
       echo "rsyncrypto -v -r /var/lib/dokuwiki $USB_MOUNT/backup/wiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
743 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
744 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
745 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
746 
+      echo '  exit 964' >> /usr/bin/$BACKUP_SCRIPT_NAME
747 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
713 748 
   fi
714 749 
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
715 750 
       echo "if [ ! -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -717,6 +752,11 @@ function create_backup_script {
717 752 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
718 753 
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
719 754 
       echo "rsyncrypto -v -r /var/www/$FULLBLOG_DOMAIN_NAME/htdocs $USB_MOUNT/backup/blog $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
755 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
756 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
757 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
758 
+      echo '  exit 854' >> /usr/bin/$BACKUP_SCRIPT_NAME
759 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
720 760 
   fi
721 761
722 762 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -727,6 +767,11 @@ function create_backup_script {
727 767 
   echo "    mkdir -p $USB_MOUNT/backup/ssl" >> /usr/bin/$BACKUP_SCRIPT_NAME
728 768 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
729 769 
   echo "  rsyncrypto  -v -r /etc/ssl $USB_MOUNT/backup/ssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
770 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
771 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
772 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
773 
+  echo '     exit 343' >> /usr/bin/$BACKUP_SCRIPT_NAME
774 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
730 775 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
731 776 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
732 777 
   echo '# Backup projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -736,6 +781,11 @@ function create_backup_script {
736 781 
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
737 782 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
738 783 
   echo "  rsyncrypto  -v -r /home/$MY_USERNAME/projects $USB_MOUNT/backup/projects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
784 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
785 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
786 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
787 
+  echo '     exit 873' >> /usr/bin/$BACKUP_SCRIPT_NAME
788 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
739 789 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
740 790 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
741 791 
   echo '# Backup personal settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -745,6 +795,11 @@ function create_backup_script {
745 795 
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
746 796 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
747 797 
   echo "  rsyncrypto  -v -r /home/$MY_USERNAME/personal $USB_MOUNT/backup/personal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
798 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
799 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
800 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
801 
+  echo '    exit 649' >> /usr/bin/$BACKUP_SCRIPT_NAME
802 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
748 803 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
749 804 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
750 805 
   echo '# Backup the public mailing list' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -754,6 +809,11 @@ function create_backup_script {
754 809 
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
755 810 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
756 811 
   echo "  rsyncrypto  -v -r $PUBLIC_MAILING_LIST_DIRECTORY $USB_MOUNT/backup/mailinglist $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
812 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
813 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
814 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
815 
+  echo '    exit 938' >> /usr/bin/$BACKUP_SCRIPT_NAME
816 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
757 817 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
758 818 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
759 819 
   echo '# Backup xmpp settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -763,6 +823,11 @@ function create_backup_script {
763 823 
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
764 824 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
765 825 
   echo "  rsyncrypto  -v -r $XMPP_DIRECTORY $USB_MOUNT/backup/xmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
826 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
827 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
828 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
829 
+  echo '    exit 593' >> /usr/bin/$BACKUP_SCRIPT_NAME
830 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
766 831 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
767 832 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
768 833 
   #echo '# Backup web content' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -782,7 +847,17 @@ function create_backup_script {
782 847 
   echo "  mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
783 848 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
784 849 
   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 /etc/nginx/sites-available /home/$MY_USERNAME/README" >> /usr/bin/$BACKUP_SCRIPT_NAME
850 
+  echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
851 
+  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
852 
+  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
853 
+  echo '  exit 495' >> /usr/bin/$BACKUP_SCRIPT_NAME
854 
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
785 855 
   echo "rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
856 
+  echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
857 
+  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
858 
+  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
859 
+  echo '  exit 496' >> /usr/bin/$BACKUP_SCRIPT_NAME
860 
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
786 861 
   echo '# Remove temporary files' >> /usr/bin/$BACKUP_SCRIPT_NAME
787 862 
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
788 863 
   echo '  echo "Removing temporary files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -797,6 +872,11 @@ function create_backup_script {
797 872 
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
798 873 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
799 874 
   echo "  rsyncrypto  -v -r /home/$MY_USERNAME/Maildir $USB_MOUNT/backup/mail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
875 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
876 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
877 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
878 
+  echo '    exit 396' >> /usr/bin/$BACKUP_SCRIPT_NAME
879 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
800 880 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
801 881 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
802 882 
   echo '# Backup DLNA cache' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -806,6 +886,11 @@ function create_backup_script {
806 886 
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
807 887 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
808 888 
   echo "  rsyncrypto  -v -r /var/cache/minidlna $USB_MOUNT/backup/dlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
889 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
890 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
891 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
892 
+  echo '    exit 498' >> /usr/bin/$BACKUP_SCRIPT_NAME
893 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
809 894 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
810 895 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
811 896 
 
@@ -828,6 +913,11 @@ function create_backup_script {
828 913 
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
829 914 
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
830 915 
       echo "rsyncrypto -v -r /root/tempmariadb $USB_MOUNT/backup/mariadb $USB_MOUNT/backup/mariadb.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
916 
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
917 
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
918 
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
919 
+      echo '  exit 794' >> /usr/bin/$BACKUP_SCRIPT_NAME
920 
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
831 921 
       echo 'shred -zu /root/tempmariadb/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
832 922 
       echo 'rm -rf /root/tempmariadb' >> /usr/bin/$BACKUP_SCRIPT_NAME
833 923 
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -1126,7 +1216,7 @@ function create_restore_script {
1126 1216 
       echo '    mkdir /root/tempredmatrix' >> /usr/bin/$RESTORE_SCRIPT_NAME
1127 1217 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1128 1218 
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/redmatrix /root/tempredmatrix $USB_MOUNT/backup/redmatrix.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1129 
-	  echo "  rm -rf /var/www/$REDMATRIX_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
1219 
+      echo "  rm -rf /var/www/$REDMATRIX_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
1130 1220 
       echo "  mv /root/tempredmatrix/usb/backup/redmatrix/www/$REDMATRIX_DOMAIN_NAME/htdocs /var/www/$REDMATRIX_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1131 1221 
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1132 1222 
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME