Bläddra i källkod

Reorganise the tempfiles

Bob Mottram 10 år sedan
förälder
incheckning
f454238524
1 ändrade filer med 20 tillägg och 24 borttagningar
  1. 20
    24
      install-freedombone.sh

+ 20
- 24
install-freedombone.sh Visa fil

@@ -611,11 +611,6 @@ function create_backup_script {
611 611
   echo "cp $BACKUP_CERTIFICATE.gpg $USB_MOUNT/backup/key.gpg" >> /usr/bin/$BACKUP_SCRIPT_NAME
612 612
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
613 613
 
614
-  echo '# Put some files into a temporary directory so that they can be easily backed up' >> /usr/bin/$BACKUP_SCRIPT_NAME
615
-  echo "if [ ! -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
616
-  echo "  mkdir /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
617
-  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
618
-  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
619 614
   echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
620 615
   echo "DATABASE_PASSWORD='$MARIADB_PASSWORD'" >> /usr/bin/$BACKUP_SCRIPT_NAME
621 616
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -747,14 +742,22 @@ function create_backup_script {
747 742
   #echo "rsyncrypto  -v -r /var/www $USB_MOUNT/backup/www $USB_MOUNT/backup/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
748 743
   #echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
749 744
   echo '# Backup other stuff' >> /usr/bin/$BACKUP_SCRIPT_NAME
745
+  echo '# Put some files into a temporary directory so that they can be easily backed up' >> /usr/bin/$BACKUP_SCRIPT_NAME
746
+  echo "if [ ! -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
747
+  echo "  mkdir /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
748
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
749
+  echo 'echo "Backing up miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
750
+  echo "if [ ! -d $USB_MOUNT/backup/misc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
751
+  echo "  mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
752
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
753
+  echo 'echo "Archiving miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
754
+  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
755
+  echo "rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
756
+  echo '# Remove temporary files' >> /usr/bin/$BACKUP_SCRIPT_NAME
750 757
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
751
-  echo '  echo "Backing up miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
752
-  echo "  if [ ! -d $USB_MOUNT/backup/misc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
753
-  echo "    mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
754
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
755
-  echo '  echo "Archiving miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
756
-  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
757
-  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
758
+  echo '  echo "Removing temporary files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
759
+  echo "  shred -zu /home/$MY_USERNAME/tempfiles/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
760
+  echo "  rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
758 761
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
759 762
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
760 763
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -801,11 +804,6 @@ function create_backup_script {
801 804
   fi
802 805
 
803 806
   echo 'sync' >> /usr/bin/$BACKUP_SCRIPT_NAME
804
-  echo '# Remove temporary files' >> /usr/bin/$BACKUP_SCRIPT_NAME
805
-  echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
806
-  echo '  echo "Removing temporary files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
807
-  echo "  rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
808
-  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
809 807
   echo "umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
810 808
   echo "rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
811 809
   echo 'echo "Backup to USB drive is complete. You can now unplug it."' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -924,18 +922,16 @@ function create_restore_script {
924 922
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
925 923
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
926 924
 
927
-  echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
928
-  echo "  rm -rf /home/$MY_USERNAME/tempfiles/*" >> /usr/bin/$RESTORE_SCRIPT_NAME
929
-  echo 'else' >> /usr/bin/$RESTORE_SCRIPT_NAME
930
-  echo "  mkdir -p /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
931
-  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
932
-  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
933
-
934 925
   #echo 'echo "Restoring web content"' >> /usr/bin/$RESTORE_SCRIPT_NAME
935 926
   #echo "rsyncrypto -v -d -r $USB_MOUNT/backup/www /var/www $USB_MOUNT/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
936 927
   #echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
937 928
 
938 929
   echo 'echo "Restoring miscellaneous files"' >> /usr/bin/$RESTORE_SCRIPT_NAME
930
+  echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
931
+  echo "  shred -zu /home/$MY_USERNAME/tempfiles/*" >> /usr/bin/$RESTORE_SCRIPT_NAME
932
+  echo 'else' >> /usr/bin/$RESTORE_SCRIPT_NAME
933
+  echo "  mkdir -p /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
934
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
939 935
   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
940 936
   echo "tar -xzvf /home/$MY_USERNAME/tempfiles/miscfiles.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
941 937
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME