Pārlūkot izejas kodu

Starting on migration of database user settings

Bob Mottram 10 gadus atpakaļ
vecāks
revīzija
7ef2f07f41
1 mainītis faili ar 51 papildinājumiem un 7 dzēšanām
  1. 51
    7
      install-freedombone.sh

+ 51
- 7
install-freedombone.sh Parādīt failu

292
 # Directory where github projects will be backed up
292
 # Directory where github projects will be backed up
293
 GITHUB_BACKUP_DIRECTORY=/var/backups/github
293
 GITHUB_BACKUP_DIRECTORY=/var/backups/github
294
 
294
 
295
+# Used to indicate whether the backup contains MariaDB databases or not
296
+BACKUP_INCLUDES_DATABASES="no"
297
+
295
 # message if something fails to install
298
 # message if something fails to install
296
 CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
299
 CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
297
 
300
 
612
   echo "if [ ! -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
615
   echo "if [ ! -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
613
   echo "  mkdir /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
616
   echo "  mkdir /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
614
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
617
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
618
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
615
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
619
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
620
+      BACKUP_INCLUDES_DATABASES="yes"
616
       echo "if [ ! -d $USB_MOUNT/backup/gnusocial ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
621
       echo "if [ ! -d $USB_MOUNT/backup/gnusocial ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
617
       echo "  mkdir -p $USB_MOUNT/backup/gnusocial" >> /usr/bin/$BACKUP_SCRIPT_NAME
622
       echo "  mkdir -p $USB_MOUNT/backup/gnusocial" >> /usr/bin/$BACKUP_SCRIPT_NAME
618
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
623
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
623
       echo "  if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
628
       echo "  if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
624
       echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
629
       echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
625
       echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
630
       echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
631
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
632
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
626
       echo '  exit 379' >> /usr/bin/$BACKUP_SCRIPT_NAME
633
       echo '  exit 379' >> /usr/bin/$BACKUP_SCRIPT_NAME
627
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
634
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
628
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
635
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
629
       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
636
       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
630
   fi
637
   fi
631
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
638
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
639
+      BACKUP_INCLUDES_DATABASES="yes"
632
       echo "if [ ! -d $USB_MOUNT/backup/redmatrix ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
640
       echo "if [ ! -d $USB_MOUNT/backup/redmatrix ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
633
       echo "  mkdir -p $USB_MOUNT/backup/redmatrix" >> /usr/bin/$BACKUP_SCRIPT_NAME
641
       echo "  mkdir -p $USB_MOUNT/backup/redmatrix" >> /usr/bin/$BACKUP_SCRIPT_NAME
634
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
642
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
639
       echo "  if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
647
       echo "  if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
640
       echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
648
       echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
641
       echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
649
       echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
650
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
651
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
642
       echo '  exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
652
       echo '  exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
643
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
653
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
644
       echo 'echo "Backing up Red Matrix installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
654
       echo 'echo "Backing up Red Matrix installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
645
       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
655
       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
646
   fi
656
   fi
647
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
657
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
658
+      BACKUP_INCLUDES_DATABASES="yes"
648
       echo "if [ ! -d $USB_MOUNT/backup/owncloud ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
659
       echo "if [ ! -d $USB_MOUNT/backup/owncloud ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
649
       echo "  mkdir -p $USB_MOUNT/backup/owncloud" >> /usr/bin/$BACKUP_SCRIPT_NAME
660
       echo "  mkdir -p $USB_MOUNT/backup/owncloud" >> /usr/bin/$BACKUP_SCRIPT_NAME
650
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
661
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
654
       echo "  if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
665
       echo "  if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
655
       echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
666
       echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
656
       echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
667
       echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
668
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
669
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
657
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
670
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
658
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
671
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
659
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
672
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
673
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
686
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
674
       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
687
       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
675
   fi
688
   fi
676
-  echo 'echo "Archiving miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
677
-  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
678
 
689
 
679
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
690
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
680
   echo '# Backup certificates' >> /usr/bin/$BACKUP_SCRIPT_NAME
691
   echo '# Backup certificates' >> /usr/bin/$BACKUP_SCRIPT_NAME
735
   echo "  if [ ! -d $USB_MOUNT/backup/misc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
746
   echo "  if [ ! -d $USB_MOUNT/backup/misc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
736
   echo "    mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
747
   echo "    mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
737
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
748
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
749
+  echo '  echo "Archiving miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
750
+  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
738
   echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
751
   echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
739
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
752
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
740
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
753
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
755
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
768
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
756
   echo "  rsyncrypto  -v -r /var/cache/minidlna $USB_MOUNT/backup/dlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
769
   echo "  rsyncrypto  -v -r /var/cache/minidlna $USB_MOUNT/backup/dlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
757
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
770
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
758
-
759
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
771
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
772
+
773
+  if [[ $BACKUP_INCLUDES_DATABASES == "yes" ]]; then
774
+      echo '# Mysql settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
775
+      echo "mysqldump --password=$MARIADB_PASSWORD mysql user > $USB_MOUNT/backup/mysql.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
776
+      echo "if [ ! -s $USB_MOUNT/backup/mysql.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
777
+      echo '  echo "Unable to backup mysql settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
778
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
779
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
780
+      echo '  exit 653' >> /usr/bin/$BACKUP_SCRIPT_NAME
781
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
782
+      echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
783
+  fi
784
+
760
   echo 'sync' >> /usr/bin/$BACKUP_SCRIPT_NAME
785
   echo 'sync' >> /usr/bin/$BACKUP_SCRIPT_NAME
761
   echo '# Remove temporary files' >> /usr/bin/$BACKUP_SCRIPT_NAME
786
   echo '# Remove temporary files' >> /usr/bin/$BACKUP_SCRIPT_NAME
762
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
787
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
826
   echo '    exit 563' >> /usr/bin/$RESTORE_SCRIPT_NAME
851
   echo '    exit 563' >> /usr/bin/$RESTORE_SCRIPT_NAME
827
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
852
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
828
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
853
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
854
+  echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
855
+  echo "DATABASE_PASSWORD=$MARIADB_PASSWORD" >> /usr/bin/$RESTORE_SCRIPT_NAME
856
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
857
+
858
+  if [[ $BACKUP_INCLUDES_DATABASES == "yes" ]]; then
859
+      echo '  echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
860
+      echo '  if [ ! -d /root/tempmariadb ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
861
+      echo '      mkdir /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
862
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
863
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mariadb /root/tempmariadb $USB_MOUNT/backup/mariadb.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
864
+      echo '  mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/mysql.sql' >> /usr/bin/$RESTORE_SCRIPT_NAME
865
+      echo '  shred -zu /root/tempmariadb/mysql.sql' >> /usr/bin/$RESTORE_SCRIPT_NAME
866
+      echo '  rm -rf /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
867
+      echo '  mysql -u root --password=$DATABASE_PASSWORD "flush privileges;"' >> /usr/bin/$RESTORE_SCRIPT_NAME
868
+      echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
869
+  fi
829
 
870
 
830
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
871
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
831
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
872
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
876
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
917
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
877
       echo "if [ -f $USB_MOUNT/backup/gnusocial.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
918
       echo "if [ -f $USB_MOUNT/backup/gnusocial.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
878
       echo '  echo "Restoring microblog database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
919
       echo '  echo "Restoring microblog database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
879
-      echo "  mysql -u root --password=$MARIADB_PASSWORD gnusocial -o < $USB_MOUNT/backup/gnusocial.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
920
+      echo -n '  mysql -u root --password=$DATABASE_PASSWORD gnusocial -o < ' >> /usr/bin/$RESTORE_SCRIPT_NAME
921
+      echo "$USB_MOUNT/backup/gnusocial.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
880
       echo '  echo "Restoring microblog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
922
       echo '  echo "Restoring microblog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
881
       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
923
       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
882
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
924
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
886
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
928
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
887
       echo "if [ -f $USB_MOUNT/backup/redmatrix.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
929
       echo "if [ -f $USB_MOUNT/backup/redmatrix.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
888
       echo '  echo "Restoring Red Matrix database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
930
       echo '  echo "Restoring Red Matrix database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
889
-      echo "  mysql -u root --password=$MARIADB_PASSWORD redmatrix -o < $USB_MOUNT/backup/redmatrix.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
931
+      echo -n '  mysql -u root --password=$DATABASE_PASSWORD redmatrix -o < ' >> /usr/bin/$RESTORE_SCRIPT_NAME
932
+      echo "$USB_MOUNT/backup/redmatrix.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
890
       echo '  echo "Restoring Red Matrix installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
933
       echo '  echo "Restoring Red Matrix installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
891
       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
934
       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
892
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
935
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
896
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
939
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
897
       echo "if [ -f $USB_MOUNT/backup/owncloud.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
940
       echo "if [ -f $USB_MOUNT/backup/owncloud.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
898
       echo '  echo "Restoring owncloud database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
941
       echo '  echo "Restoring owncloud database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
899
-      echo "  mysql -u root --password=$MARIADB_PASSWORD owncloud -o < $USB_MOUNT/backup/owncloud.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
942
+      echo -n '  mysql -u root --password=$DATABASE_PASSWORD owncloud -o < ' >> /usr/bin/$RESTORE_SCRIPT_NAME
943
+      echo "$USB_MOUNT/backup/owncloud.sql" >> /usr/bin/$RESTORE_SCRIPT_NAME
900
       echo '  echo "Restoring Owncloud installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
944
       echo '  echo "Restoring Owncloud installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
901
       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
945
       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
902
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
946
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
923
   echo "rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
967
   echo "rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
924
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
968
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
925
 
969
 
926
-  echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
970
+  echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
927
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
971
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
928
   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
972
   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
929
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
973
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME