Browse Source

Refactoring backup to usb

Bob Mottram 9 years ago
parent
commit
04d392eb44
1 changed files with 56 additions and 222 deletions
  1. 56
    222
      src/freedombone

+ 56
- 222
src/freedombone View File

2409
   fi
2409
   fi
2410
 }
2410
 }
2411
 
2411
 
2412
+BACKUP_TYPE='rsync'
2413
+
2414
+function backup_directory_to_usb {
2415
+    if [[ $BACKUP_TYPE == 'rsync' ]]; then
2416
+        echo "rsyncrypto -v -r ${1} $USB_MOUNT/backup/${2} $USB_MOUNT/backup/${2}.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2417
+        echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2418
+        echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2419
+        echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2420
+        if [[ ${1} == "/root/temp"* ]]; then
2421
+            echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2422
+            echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2423
+        fi
2424
+        echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2425
+        echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2426
+        if [[ ${1} == "/root/temp"* ]]; then
2427
+            echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2428
+            echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2429
+        fi
2430
+    fi
2431
+}
2432
+
2412
 # For rsyncrypto usage see http://archive09.linux.com/feature/125322
2433
 # For rsyncrypto usage see http://archive09.linux.com/feature/125322
2413
 function create_backup_script {
2434
 function create_backup_script {
2414
   if grep -Fxq "create_backup_script" $COMPLETION_FILE; then
2435
   if grep -Fxq "create_backup_script" $COMPLETION_FILE; then
2511
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2532
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2512
       echo '  exit 296' >> /usr/bin/$BACKUP_SCRIPT_NAME
2533
       echo '  exit 296' >> /usr/bin/$BACKUP_SCRIPT_NAME
2513
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2534
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2514
-      echo "rsyncrypto -v -r /root/tempgnusocialdata $USB_MOUNT/backup/gnusocialdata $USB_MOUNT/backup/gnusocialdata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2515
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2516
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2517
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2518
-      echo '  shred -zu /root/tempgnusocialdata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2519
-      echo '  rm -rf /root/tempgnusocialdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2520
-      echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2521
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2522
-      echo 'shred -zu /root/tempgnusocialdata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2523
-      echo 'rm -rf /root/tempgnusocialdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2535
+      backup_directory_to_usb /root/tempgnusocialdata gnusocialdata
2524
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2536
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2525
-      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
2526
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2527
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2528
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2529
-      echo '  exit 846' >> /usr/bin/$BACKUP_SCRIPT_NAME
2530
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2537
+      backup_directory_to_usb /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
2531
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2538
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2532
   fi
2539
   fi
2533
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
2540
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
2554
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2561
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2555
       echo '  exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
2562
       echo '  exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
2556
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2563
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2557
-      echo "rsyncrypto -v -r /root/temphubzilladata $USB_MOUNT/backup/hubzilladata $USB_MOUNT/backup/hubzilladata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2558
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2559
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2560
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2561
-      echo '   exit 285' >> /usr/bin/$BACKUP_SCRIPT_NAME
2562
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2563
-      echo 'shred -zu /root/temphubzilladata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2564
-      echo 'rm -rf /root/temphubzilladata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2564
+      backup_directory_to_usb /root/temphubzilladata hubzilladata
2565
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2565
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2566
-      echo "rsyncrypto -v -r /var/www/$HUBZILLA_DOMAIN_NAME/htdocs $USB_MOUNT/backup/hubzilla $USB_MOUNT/backup/hubzilla.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2567
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2568
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2569
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2570
-      echo '   exit 593' >> /usr/bin/$BACKUP_SCRIPT_NAME
2571
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2566
+      backup_directory_to_usb /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
2572
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2567
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2573
   fi
2568
   fi
2574
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
2569
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
2597
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2592
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2598
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
2593
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
2599
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2594
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2600
-      echo "rsyncrypto -v -r /root/tempownclouddata $USB_MOUNT/backup/ownclouddata $USB_MOUNT/backup/ownclouddata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2601
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2602
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2603
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2604
-      echo '   exit 188' >> /usr/bin/$BACKUP_SCRIPT_NAME
2605
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2606
-      echo 'shred -zu /root/tempownclouddata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2607
-      echo 'rm -rf /root/tempownclouddata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2595
+      backup_directory_to_usb /root/tempownclouddata ownclouddata
2608
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2596
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2609
-      echo "rsyncrypto -v -r /var/lib/owncloud $USB_MOUNT/backup/owncloud $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2610
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2611
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2612
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2613
-      echo '  exit 632' >> /usr/bin/$BACKUP_SCRIPT_NAME
2614
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2615
-      echo "rsyncrypto -v -r /etc/owncloud $USB_MOUNT/backup/owncloud2 $USB_MOUNT/backup/owncloud2.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2616
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2617
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2618
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2619
-      echo '  exit 632' >> /usr/bin/$BACKUP_SCRIPT_NAME
2620
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2597
+      backup_directory_to_usb /var/lib/owncloud owncloud
2598
+      backup_directory_to_usb /etc/owncloud owncloud2
2621
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2599
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2622
   fi
2600
   fi
2623
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
2601
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
2646
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2624
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2647
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
2625
       echo '  exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
2648
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2626
       echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2649
-      echo "rsyncrypto -v -r /root/tempgogsdata $USB_MOUNT/backup/gogsdata $USB_MOUNT/backup/gogsdata.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2650
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2651
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2652
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2653
-      echo '   exit 188' >> /usr/bin/$BACKUP_SCRIPT_NAME
2654
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2655
-      echo 'shred -zu /root/tempgogsdata/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2656
-      echo 'rm -rf /root/tempgogsdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2627
+      backup_directory_to_usb /root/tempgogsdata gogsdata
2657
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2628
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2658
-      echo "rsyncrypto -v -r /home/git/go/src/github.com/gogits/gogs/custom $USB_MOUNT/backup/gogs $USB_MOUNT/backup/gogs.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2659
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2660
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2661
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2662
-      echo '  exit 632' >> /usr/bin/$BACKUP_SCRIPT_NAME
2663
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2629
+      backup_directory_to_usb /home/git/go/src/github.com/gogits/gogs/custom gogs
2664
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2630
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2665
-      echo "rsyncrypto -v -r /home/git/gogs-repositories $USB_MOUNT/backup/gogsrepos $USB_MOUNT/backup/gogsrepos.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2666
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2667
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2668
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2669
-      echo '  exit 6784' >> /usr/bin/$BACKUP_SCRIPT_NAME
2670
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2631
+      backup_directory_to_usb /home/git/gogs-repositories gogsrepos
2671
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2632
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2672
-      echo "rsyncrypto -v -r /home/git/.ssh $USB_MOUNT/backup/gogsssh $USB_MOUNT/backup/gogsssh.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2673
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2674
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2675
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2676
-      echo '  exit 58932' >> /usr/bin/$BACKUP_SCRIPT_NAME
2677
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2633
+      backup_directory_to_usb /home/git/.ssh gogsssh
2678
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2634
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2679
   fi
2635
   fi
2680
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
2636
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
2685
       echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2641
       echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2686
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2642
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2687
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2643
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2688
-      echo "rsyncrypto -v -r /var/lib/dokuwiki $USB_MOUNT/backup/wiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2689
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2690
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2691
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2692
-      echo '  exit 964' >> /usr/bin/$BACKUP_SCRIPT_NAME
2693
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2694
-      echo "rsyncrypto -v -r /etc/dokuwiki $USB_MOUNT/backup/wiki2 $USB_MOUNT/backup/wiki2.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2695
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2696
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2697
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2698
-      echo '  exit 964' >> /usr/bin/$BACKUP_SCRIPT_NAME
2699
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2644
+      backup_directory_to_usb /var/lib/dokuwiki wiki
2645
+      backup_directory_to_usb /etc/dokuwiki wiki2
2700
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2646
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2701
   fi
2647
   fi
2702
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
2648
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
2704
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2650
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2705
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2651
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2706
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2652
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2707
-      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
2708
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2709
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2710
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2711
-      echo '  exit 854' >> /usr/bin/$BACKUP_SCRIPT_NAME
2712
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2653
+      backup_directory_to_usb /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog
2713
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2654
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2714
   fi
2655
   fi
2715
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
2656
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
2717
       echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
2658
       echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
2718
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2659
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2719
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2660
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2720
-      echo "rsyncrypto -v -r /etc/cjdns $USB_MOUNT/backup/blog $USB_MOUNT/backup/cjdns.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2721
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2722
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2723
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2724
-      echo '  exit 7438' >> /usr/bin/$BACKUP_SCRIPT_NAME
2725
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2661
+      backup_directory_to_usb /etc/cjdns cjdns
2726
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2662
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2727
   fi
2663
   fi
2728
 
2664
 
2733
   echo "  if [ ! -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2669
   echo "  if [ ! -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2734
   echo "    mkdir -p $USB_MOUNT/backup/ssl" >> /usr/bin/$BACKUP_SCRIPT_NAME
2670
   echo "    mkdir -p $USB_MOUNT/backup/ssl" >> /usr/bin/$BACKUP_SCRIPT_NAME
2735
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2671
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2736
-  echo "  rsyncrypto  -v -r /etc/ssl $USB_MOUNT/backup/ssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2737
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2738
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2739
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2740
-  echo '     exit 343' >> /usr/bin/$BACKUP_SCRIPT_NAME
2741
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2672
+  backup_directory_to_usb /etc/ssl ssl
2742
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2673
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2743
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2674
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2744
 
2675
 
2748
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2679
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2749
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
2680
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
2750
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2681
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2751
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/projects ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2752
-  echo "$USB_MOUNT/backup/projects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2753
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2754
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2755
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2756
-  echo '     exit 873' >> /usr/bin/$BACKUP_SCRIPT_NAME
2757
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2682
+  backup_directory_to_usb '/home/$MY_USERNAME/projects' projects
2758
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2683
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2759
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2684
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2760
 
2685
 
2764
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2689
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2765
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
2690
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
2766
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2691
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2767
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/personal ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2768
-  echo "$USB_MOUNT/backup/personal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2769
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2770
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2771
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2772
-  echo '    exit 649' >> /usr/bin/$BACKUP_SCRIPT_NAME
2773
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2692
+  backup_directory_to_usb '/home/$MY_USERNAME/personal' personal
2774
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2693
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2775
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2694
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2776
 
2695
 
2780
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2699
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2781
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2700
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2782
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2701
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2783
-  echo "  rsyncrypto  -v -r $PUBLIC_MAILING_LIST_DIRECTORY $USB_MOUNT/backup/mailinglist $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2784
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2785
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2786
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2787
-  echo '    exit 938' >> /usr/bin/$BACKUP_SCRIPT_NAME
2788
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2702
+  backup_directory_to_usb $PUBLIC_MAILING_LIST_DIRECTORY mailinglist
2789
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2703
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2790
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2704
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2791
 
2705
 
2795
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2709
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2796
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2710
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2797
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2711
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2798
-  echo "  rsyncrypto  -v -r $XMPP_DIRECTORY $USB_MOUNT/backup/xmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2799
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2800
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2801
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2802
-  echo '    exit 593' >> /usr/bin/$BACKUP_SCRIPT_NAME
2803
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2712
+  backup_directory_to_usb $XMPP_DIRECTORY xmpp
2804
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2713
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2805
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2714
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2806
 
2715
 
2810
   echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2719
   echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2811
   echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2720
   echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2812
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2721
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2813
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/.gnupg ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2814
-  echo "$USB_MOUNT/backup/gnupg $USB_MOUNT/backup/gnupg.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2815
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2816
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2817
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2818
-  echo '    exit 491' >> /usr/bin/$BACKUP_SCRIPT_NAME
2819
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2722
+  backup_directory_to_usb '/home/$MY_USERNAME/.gnupg' gnupg
2820
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2723
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2821
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2724
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2822
 
2725
 
2826
   echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2729
   echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2827
   echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2730
   echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2828
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2731
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2829
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/.ssh ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2830
-  echo "$USB_MOUNT/backup/ssh $USB_MOUNT/backup/ssh.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2831
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2832
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2833
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2834
-  echo '    exit 731' >> /usr/bin/$BACKUP_SCRIPT_NAME
2835
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2732
+  backup_directory_to_usb '/home/$MY_USERNAME/.ssh' ssh
2836
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2733
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2837
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2734
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2838
 
2735
 
2842
   echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2739
   echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2843
   echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
2740
   echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
2844
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2741
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2845
-  echo "  rsyncrypto  -v -r /etc/nginx/sites-available $USB_MOUNT/backup/web $USB_MOUNT/backup/web.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2846
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2847
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2848
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2849
-  echo '    exit 848' >> /usr/bin/$BACKUP_SCRIPT_NAME
2850
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2742
+  backup_directory_to_usb /etc/nginx/sites-available web
2851
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2743
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2852
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2744
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2853
 
2745
 
2861
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2753
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2862
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2754
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2863
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2755
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2864
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2865
-  echo "$USB_MOUNT/backup/readme $USB_MOUNT/backup/readme.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2866
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2867
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2868
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2869
-  echo '    rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2870
-  echo '    exit 848' >> /usr/bin/$BACKUP_SCRIPT_NAME
2871
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2756
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' readme
2872
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2757
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2873
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2758
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2874
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2759
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2886
   echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2771
   echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2887
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2772
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2888
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2773
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2889
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2890
-  echo "$USB_MOUNT/backup/mutt $USB_MOUNT/backup/mutt.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2891
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2892
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2893
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2894
-  echo '    rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2895
-  echo '    exit 492' >> /usr/bin/$BACKUP_SCRIPT_NAME
2896
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2774
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' mutt
2897
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2775
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2898
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2776
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2899
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2777
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2908
   echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2786
   echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2909
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2787
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2910
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2788
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2911
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2912
-  echo "$USB_MOUNT/backup/procmail $USB_MOUNT/backup/procmail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2913
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2914
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2915
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2916
-  echo '    rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2917
-  echo '    exit 492' >> /usr/bin/$BACKUP_SCRIPT_NAME
2918
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2789
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' procmail
2919
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2790
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2920
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2791
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2921
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2792
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2926
   echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2797
   echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2927
   echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
2798
   echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
2928
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2799
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2929
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/.spamassassin ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2930
-  echo "$USB_MOUNT/backup/spamassassin $USB_MOUNT/backup/spamassassin.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2931
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2932
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2933
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2934
-  echo '    exit 492' >> /usr/bin/$BACKUP_SCRIPT_NAME
2935
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2800
+  backup_directory_to_usb '/home/$MY_USERNAME/.spamassassin' spamassassin
2936
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2801
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2937
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2802
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2938
 
2803
 
2939
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
2804
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
2940
   echo 'if [ -d /home/$MY_USERNAME/Maildir ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2805
   echo 'if [ -d /home/$MY_USERNAME/Maildir ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2941
   echo '  echo "Creating an email archive"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2806
   echo '  echo "Creating an email archive"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2942
-  echo '  if [ ! -d /root/backupemail ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2943
-  echo "    mkdir -p /root/backupemail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2807
+  echo '  if [ ! -d /root/tempbackupemail ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2808
+  echo "    mkdir -p /root/tempbackupemail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2944
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2809
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2945
-  echo '  tar -czvf /root/backupemail/maildir.tar.gz /home/$MY_USERNAME/Maildir' >> /usr/bin/$BACKUP_SCRIPT_NAME
2810
+  echo '  tar -czvf /root/tempbackupemail/maildir.tar.gz /home/$MY_USERNAME/Maildir' >> /usr/bin/$BACKUP_SCRIPT_NAME
2946
   echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2811
   echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2947
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2812
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2948
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2813
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2949
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2814
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2950
-  echo "  rsyncrypto  -v -r /root/backupemail $USB_MOUNT/backup/mail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2951
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2952
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2953
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2954
-  echo '    rm -rf /root/backupemail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2955
-  echo '    exit 396' >> /usr/bin/$BACKUP_SCRIPT_NAME
2956
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2957
-  echo '  rm -rf /root/backupemail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2815
+  backup_directory_to_usb /root/tempbackupemail mail
2958
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2816
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2959
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2817
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2960
 
2818
 
2964
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2822
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2965
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
2823
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
2966
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2824
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2967
-  echo "  rsyncrypto  -v -r /var/cache/minidlna $USB_MOUNT/backup/dlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2968
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2969
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2970
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2971
-  echo '    exit 498' >> /usr/bin/$BACKUP_SCRIPT_NAME
2972
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2825
+  backup_directory_to_usb /var/cache/minidlna dlna
2973
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2826
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2974
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2827
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2975
 
2828
 
2986
   echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2839
   echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2987
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2840
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2988
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2841
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2989
-  echo -n '  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2990
-  echo "$USB_MOUNT/backup/voip $USB_MOUNT/backup/voip.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2991
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2992
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2993
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2994
-  echo '    rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2995
-  echo '    exit 2492' >> /usr/bin/$BACKUP_SCRIPT_NAME
2996
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2842
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' voip
2997
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2843
   echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2998
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2844
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2999
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2845
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
3016
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2862
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
3017
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2863
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
3018
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2864
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
3019
-      echo "rsyncrypto -v -r /root/tempmariadb $USB_MOUNT/backup/mariadb $USB_MOUNT/backup/mariadb.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
3020
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
3021
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
3022
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
3023
-      echo '  exit 794' >> /usr/bin/$BACKUP_SCRIPT_NAME
3024
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
3025
-      echo 'shred -zu /root/tempmariadb/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
3026
-      echo 'rm -rf /root/tempmariadb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2865
+      backup_directory_to_usb /root/tempmariadb mariadb
3027
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2866
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
3028
   fi
2867
   fi
3029
 
2868
 
3034
   echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
2873
   echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
3035
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2874
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
3036
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
2875
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
3037
-  echo "  rsyncrypto  -v -r /var/lib/tox-bootstrapd $USB_MOUNT/backup/tox $USB_MOUNT/backup/tox.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
3038
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
3039
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
3040
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
3041
-  echo '    exit 75379' >> /usr/bin/$BACKUP_SCRIPT_NAME
3042
-  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2876
+  backup_directory_to_usb /var/lib/tox-bootstrapd tox
3043
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2877
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
3044
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2878
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
3045
 
2879