浏览代码

Improving local backup script

Bob Mottram 9 年前
父节点
当前提交
cb60115210
共有 1 个文件被更改,包括 106 次插入92 次删除
  1. 106
    92
      src/freedombone

+ 106
- 92
src/freedombone 查看文件

@@ -2416,64 +2416,74 @@ function get_mariadb_owncloud_admin_password {
2416 2416
 }
2417 2417
 
2418 2418
 function backup_directory_to_usb {
2419
-  echo "if [ ! -d ${1} ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2420
-  echo "  echo \"WARNING: directory does not exist: ${1}\"" >> /usr/bin/$BACKUP_SCRIPT_NAME
2421
-  echo 'else' >> /usr/bin/$BACKUP_SCRIPT_NAME
2419
+  echo 'function backup_directory_to_usb {' >> /usr/bin/$BACKUP_SCRIPT_NAME
2420
+  echo "  MY_NAME=\"$MY_NAME\"" >> /usr/bin/$BACKUP_SCRIPT_NAME
2421
+  echo "  USB_MOUNT=$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2422
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2423
+  echo '  if [ ! -d ${1} ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2424
+  echo '    echo "WARNING: directory does not exist: ${1}"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2425
+  echo '  else' >> /usr/bin/$BACKUP_SCRIPT_NAME
2422 2426
 
2423 2427
   if [[ $BACKUP_TYPE == 'obnam' ]]; then
2424
-      BACKUP_KEY_EXISTS=$(gpg --list-keys "$MY_NAME (backup key)")
2425
-      if [ ! "$?" = "0" ]; then
2426
-          echo "Backup key could not be found"
2427
-          exit 43382
2428
-      fi
2429
-      MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
2430
-      echo "  obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2428
+      echo '    BACKUP_KEY_EXISTS=$(gpg --list-keys "$MY_NAME (backup key)")' >> /usr/bin/$BACKUP_SCRIPT_NAME
2429
+      echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2430
+      echo '      echo "Backup key could not be found"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2431
+      echo '      exit 43382' >> /usr/bin/$BACKUP_SCRIPT_NAME
2432
+      echo '    fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2433
+      echo '    MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" | grep "pub " | awk -F " " "{print $2}" | awk -F "/" "{print $2}")' >> /usr/bin/$BACKUP_SCRIPT_NAME
2434
+      echo '    obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2431 2435
   else
2432 2436
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
2433
-      echo "  rsyncrypto -v -r ${1} $USB_MOUNT/backup/${2} $USB_MOUNT/backup/${2}.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2434
-  fi
2435
-
2436
-  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2437
-  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2438
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2439
-  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
2440
-      echo "    shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2441
-      echo "    rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2442
-  fi
2443
-  echo '    exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2437
+      echo "    BACKUP_CERTIFICATE=$BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2438
+      echo '    rsyncrypto -v -r ${1} $USB_MOUNT/backup/${2} $USB_MOUNT/backup/${2}.keys $BACKUP_CERTIFICATE' >> /usr/bin/$BACKUP_SCRIPT_NAME
2439
+  fi
2440
+
2441
+  echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2442
+  echo '      umount $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2443
+  echo '      rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2444
+  echo '      if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2445
+  echo '        shred -zu ${1}/*"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2446
+  echo '        rm -rf ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2447
+  echo '      fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2448
+  echo '      exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2449
+  echo '    fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2450
+  echo '    if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2451
+  echo '        shred -zu ${1}/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2452
+  echo '        rm -rf ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2453
+  echo '    fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2444 2454
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2445
-  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
2446
-      echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2447
-      echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2448
-  fi
2449
-  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2455
+  echo '}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2450 2456
 }
2451 2457
 
2452 2458
 function backup_database {
2453 2459
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2454
-  echo "if [ ! -d $USB_MOUNT/backup/${1} ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2455
-  echo "  mkdir -p $USB_MOUNT/backup/${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2456
-  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2457
-  echo "if [ ! -d $USB_MOUNT/backup/${1}data ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2458
-  echo "  mkdir -p $USB_MOUNT/backup/${1}data" >> /usr/bin/$BACKUP_SCRIPT_NAME
2459
-  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2460
-  echo "if [ ! -d /root/temp${1}data ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2461
-  echo "  mkdir -p /root/temp${1}data" >> /usr/bin/$BACKUP_SCRIPT_NAME
2462
-  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2463
-  echo "echo \"Obtaining ${1} database backup\"" >> /usr/bin/$BACKUP_SCRIPT_NAME
2464
-  echo -n 'mysqldump --password=$DATABASE_PASSWORD ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2465
-  echo "${1} > /root/temp${1}data/${1}.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
2466
-  echo "if [ ! -s /root/temp${1}data/${1}.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2467
-  echo "  echo \"${1} database could not be saved\"" >> /usr/bin/$BACKUP_SCRIPT_NAME
2468
-  echo '  if [ ! $DATABASE_PASSWORD ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2469
-  echo "    echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
2470
-  echo "  fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2471
-  echo "  shred -zu /root/temp${1}data/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2472
-  echo "  rm -rf /root/temp${1}data" >> /usr/bin/$BACKUP_SCRIPT_NAME
2473
-  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2474
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2475
-  echo '  exit 296' >> /usr/bin/$BACKUP_SCRIPT_NAME
2476
-  echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
2460
+  echo 'function backup_database {' >> /usr/bin/$BACKUP_SCRIPT_NAME
2461
+  echo "  USB_MOUNT=$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2462
+  echo "  DATABASE_PASSWORD='$DATABASE_PASSWORD'" >> /usr/bin/$BACKUP_SCRIPT_NAME
2463
+  echo '  if [ ! -d $USB_MOUNT/backup/${1} ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2464
+  echo '    mkdir -p $USB_MOUNT/backup/${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2465
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2466
+  echo '  if [ ! -d $USB_MOUNT/backup/${1}data ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2467
+  echo '    mkdir -p $USB_MOUNT/backup/${1}data' >> /usr/bin/$BACKUP_SCRIPT_NAME
2468
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2469
+  echo '  if [ ! -d /root/temp${1}data ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2470
+  echo '    mkdir -p /root/temp${1}data' >> /usr/bin/$BACKUP_SCRIPT_NAME
2471
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2472
+  echo '  echo "Obtaining ${1} database backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2473
+  echo -n '  mysqldump --password=$DATABASE_PASSWORD ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2474
+  echo '${1} > /root/temp${1}data/${1}.sql' >> /usr/bin/$BACKUP_SCRIPT_NAME
2475
+  echo '  if [ ! -s /root/temp${1}data/${1}.sql ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2476
+  echo '    echo "${1} database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2477
+  echo '    if [ ! $DATABASE_PASSWORD ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2478
+  echo '      echo "No MariaDB password was given"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2479
+  echo '    fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2480
+  echo '    shred -zu /root/temp${1}data/*' >> /usr/bin/$BACKUP_SCRIPT_NAME
2481
+  echo '    rm -rf /root/temp${1}data' >> /usr/bin/$BACKUP_SCRIPT_NAME
2482
+  echo '    umount $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2483
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2484
+  echo '    exit 296' >> /usr/bin/$BACKUP_SCRIPT_NAME
2485
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2486
+  echo '}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2477 2487
 }
2478 2488
 
2479 2489
 function create_backup_script {
@@ -2535,6 +2545,10 @@ function create_backup_script {
2535 2545
   echo '  exit 27' >> /usr/bin/$BACKUP_SCRIPT_NAME
2536 2546
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2537 2547
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2548
+  backup_database
2549
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2550
+  backup_directory_to_usb
2551
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2538 2552
 
2539 2553
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
2540 2554
       echo "if [ ! -f $BACKUP_CERTIFICATE ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2556,18 +2570,18 @@ function create_backup_script {
2556 2570
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2557 2571
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
2558 2572
       BACKUP_INCLUDES_DATABASES="yes"
2559
-      backup_database gnusocial
2560
-      backup_directory_to_usb '/root/tempgnusocialdata' 'gnusocialdata'
2573
+      echo 'backup_database gnusocial' >> /usr/bin/$BACKUP_SCRIPT_NAME
2574
+      echo 'backup_directory_to_usb /root/tempgnusocialdata gnusocialdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2561 2575
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2562
-      backup_directory_to_usb /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
2576
+      echo "backup_directory_to_usb /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial" >> /usr/bin/$BACKUP_SCRIPT_NAME
2563 2577
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2564 2578
   fi
2565 2579
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
2566 2580
       BACKUP_INCLUDES_DATABASES="yes"
2567
-      backup_database hubzilla
2568
-      backup_directory_to_usb '/root/temphubzilladata' 'hubzilladata'
2581
+      echo 'backup_database hubzilla' >> /usr/bin/$BACKUP_SCRIPT_NAME
2582
+      echo 'backup_directory_to_usb /root/temphubzilladata hubzilladata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2569 2583
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2570
-      backup_directory_to_usb /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
2584
+      echo "backup_directory_to_usb /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla" >> /usr/bin/$BACKUP_SCRIPT_NAME
2571 2585
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2572 2586
   fi
2573 2587
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
@@ -2575,11 +2589,11 @@ function create_backup_script {
2575 2589
       echo "if [ ! -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2576 2590
       echo "  mkdir -p $USB_MOUNT/backup/owncloud2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2577 2591
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2578
-      backup_database owncloud
2579
-      backup_directory_to_usb '/root/tempownclouddata' 'ownclouddata'
2592
+      echo 'backup_database owncloud' >> /usr/bin/$BACKUP_SCRIPT_NAME
2593
+      echo 'backup_directory_to_usb /root/tempownclouddata ownclouddata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2580 2594
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2581
-      backup_directory_to_usb '/var/lib/owncloud' 'owncloud'
2582
-      backup_directory_to_usb '/etc/owncloud' 'owncloud2'
2595
+      echo 'backup_directory_to_usb /var/lib/owncloud owncloud' >> /usr/bin/$BACKUP_SCRIPT_NAME
2596
+      echo 'backup_directory_to_usb /etc/owncloud owncloud2' >> /usr/bin/$BACKUP_SCRIPT_NAME
2583 2597
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2584 2598
   fi
2585 2599
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
@@ -2590,15 +2604,15 @@ function create_backup_script {
2590 2604
       echo "if [ ! -d $USB_MOUNT/backup/gogsssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2591 2605
       echo "  mkdir -p $USB_MOUNT/backup/gogsssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2592 2606
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2593
-      backup_database gogs
2594
-      backup_directory_to_usb '/root/tempgogsdata' 'gogsdata'
2607
+      echo 'backup_database gogs' >> /usr/bin/$BACKUP_SCRIPT_NAME
2608
+      echo 'backup_directory_to_usb /root/tempgogsdata gogsdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
2595 2609
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2596
-      backup_directory_to_usb '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
2610
+      echo 'backup_directory_to_usb /home/git/go/src/github.com/gogits/gogs/custom gogs' >> /usr/bin/$BACKUP_SCRIPT_NAME
2597 2611
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2598
-      echo "mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME" >> /usr/bin/$BACKUP_SCRIPT_NAME
2599
-      backup_directory_to_usb '/home/git/gogs-repositories' 'gogsrepos'
2612
+      echo 'mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME' >> /usr/bin/$BACKUP_SCRIPT_NAME
2613
+      echo 'backup_directory_to_usb /home/git/gogs-repositories gogsrepos' >> /usr/bin/$BACKUP_SCRIPT_NAME
2600 2614
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2601
-      backup_directory_to_usb '/home/git/.ssh' 'gogsssh'
2615
+      echo 'backup_directory_to_usb /home/git/.ssh gogsssh' >> /usr/bin/$BACKUP_SCRIPT_NAME
2602 2616
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2603 2617
   fi
2604 2618
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
@@ -2609,8 +2623,8 @@ function create_backup_script {
2609 2623
       echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2610 2624
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2611 2625
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2612
-      backup_directory_to_usb '/var/lib/dokuwiki' 'wiki'
2613
-      backup_directory_to_usb '/etc/dokuwiki' 'wiki2'
2626
+      echo 'backup_directory_to_usb /var/lib/dokuwiki wiki' >> /usr/bin/$BACKUP_SCRIPT_NAME
2627
+      echo 'backup_directory_to_usb /etc/dokuwiki wiki2' >> /usr/bin/$BACKUP_SCRIPT_NAME
2614 2628
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2615 2629
   fi
2616 2630
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
@@ -2618,7 +2632,7 @@ function create_backup_script {
2618 2632
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2619 2633
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2620 2634
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2621
-      backup_directory_to_usb "/var/www/$FULLBLOG_DOMAIN_NAME/htdocs" 'blog'
2635
+      echo "backup_directory_to_usb /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2622 2636
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2623 2637
   fi
2624 2638
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
@@ -2626,7 +2640,7 @@ function create_backup_script {
2626 2640
       echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
2627 2641
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2628 2642
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2629
-      backup_directory_to_usb '/etc/cjdns' 'cjdns'
2643
+      echo 'backup_directory_to_usb /etc/cjdns cjdns' >> /usr/bin/$BACKUP_SCRIPT_NAME
2630 2644
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2631 2645
   fi
2632 2646
 
@@ -2637,7 +2651,7 @@ function create_backup_script {
2637 2651
   echo "  if [ ! -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2638 2652
   echo "    mkdir -p $USB_MOUNT/backup/ssl" >> /usr/bin/$BACKUP_SCRIPT_NAME
2639 2653
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2640
-  backup_directory_to_usb /etc/ssl ssl
2654
+  echo '  backup_directory_to_usb /etc/ssl ssl' >> /usr/bin/$BACKUP_SCRIPT_NAME
2641 2655
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2642 2656
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2643 2657
 
@@ -2647,7 +2661,7 @@ function create_backup_script {
2647 2661
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2648 2662
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
2649 2663
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2650
-  backup_directory_to_usb '/home/$MY_USERNAME/projects' 'projects'
2664
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/projects projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
2651 2665
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2652 2666
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2653 2667
 
@@ -2657,7 +2671,7 @@ function create_backup_script {
2657 2671
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2658 2672
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
2659 2673
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2660
-  backup_directory_to_usb '/home/$MY_USERNAME/personal' 'personal'
2674
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/personal personal' >> /usr/bin/$BACKUP_SCRIPT_NAME
2661 2675
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2662 2676
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2663 2677
 
@@ -2667,7 +2681,7 @@ function create_backup_script {
2667 2681
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2668 2682
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2669 2683
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2670
-  backup_directory_to_usb "$PUBLIC_MAILING_LIST_DIRECTORY" 'mailinglist'
2684
+  echo "  backup_directory_to_usb $PUBLIC_MAILING_LIST_DIRECTORY mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2671 2685
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2672 2686
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2673 2687
 
@@ -2677,7 +2691,7 @@ function create_backup_script {
2677 2691
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2678 2692
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2679 2693
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2680
-  backup_directory_to_usb "$XMPP_DIRECTORY" "xmpp"
2694
+  echo "  backup_directory_to_usb $XMPP_DIRECTORY xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2681 2695
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2682 2696
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2683 2697
 
@@ -2687,7 +2701,7 @@ function create_backup_script {
2687 2701
   echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2688 2702
   echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2689 2703
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2690
-  backup_directory_to_usb '/home/$MY_USERNAME/.gnupg' 'gnupg'
2704
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/.gnupg gnupg' >> /usr/bin/$BACKUP_SCRIPT_NAME
2691 2705
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2692 2706
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2693 2707
 
@@ -2697,7 +2711,7 @@ function create_backup_script {
2697 2711
   echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2698 2712
   echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2699 2713
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2700
-  backup_directory_to_usb '/home/$MY_USERNAME/.ssh' 'ssh'
2714
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/.ssh ssh' >> /usr/bin/$BACKUP_SCRIPT_NAME
2701 2715
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2702 2716
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2703 2717
 
@@ -2707,7 +2721,7 @@ function create_backup_script {
2707 2721
   echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2708 2722
   echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
2709 2723
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2710
-  backup_directory_to_usb '/etc/nginx/sites-available' 'web'
2724
+  echo '  backup_directory_to_usb /etc/nginx/sites-available web' >> /usr/bin/$BACKUP_SCRIPT_NAME
2711 2725
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2712 2726
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2713 2727
 
@@ -2721,7 +2735,7 @@ function create_backup_script {
2721 2735
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2722 2736
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2723 2737
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2724
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'readme'
2738
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup readme' >> /usr/bin/$BACKUP_SCRIPT_NAME
2725 2739
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2726 2740
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2727 2741
 
@@ -2731,7 +2745,7 @@ function create_backup_script {
2731 2745
   echo "  if [ ! -d $USB_MOUNT/backup/ipfs ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2732 2746
   echo "    mkdir -p $USB_MOUNT/backup/ipfs" >> /usr/bin/$BACKUP_SCRIPT_NAME
2733 2747
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2734
-  backup_directory_to_usb '/home/$MY_USERNAME/.ipfs' 'ipfs'
2748
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/.ipfs ipfs' >> /usr/bin/$BACKUP_SCRIPT_NAME
2735 2749
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2736 2750
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2737 2751
 
@@ -2748,7 +2762,7 @@ function create_backup_script {
2748 2762
   echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2749 2763
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2750 2764
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2751
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'mutt'
2765
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup mutt' >> /usr/bin/$BACKUP_SCRIPT_NAME
2752 2766
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2753 2767
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2754 2768
 
@@ -2762,7 +2776,7 @@ function create_backup_script {
2762 2776
   echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2763 2777
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2764 2778
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2765
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'procmail'
2779
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup procmail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2766 2780
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2767 2781
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2768 2782
 
@@ -2772,7 +2786,7 @@ function create_backup_script {
2772 2786
   echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2773 2787
   echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
2774 2788
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2775
-  backup_directory_to_usb '/home/$MY_USERNAME/.spamassassin' 'spamassassin'
2789
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/.spamassassin spamassassin' >> /usr/bin/$BACKUP_SCRIPT_NAME
2776 2790
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2777 2791
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2778 2792
 
@@ -2787,7 +2801,7 @@ function create_backup_script {
2787 2801
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2788 2802
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2789 2803
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2790
-  backup_directory_to_usb '/root/tempbackupemail' 'mail'
2804
+  echo '  backup_directory_to_usb /root/tempbackupemail mail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2791 2805
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2792 2806
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2793 2807
 
@@ -2797,7 +2811,7 @@ function create_backup_script {
2797 2811
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2798 2812
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
2799 2813
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2800
-  backup_directory_to_usb '/var/cache/minidlna' 'dlna'
2814
+  echo '  backup_directory_to_usb /var/cache/minidlna dlna' >> /usr/bin/$BACKUP_SCRIPT_NAME
2801 2815
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2802 2816
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2803 2817
 
@@ -2814,7 +2828,7 @@ function create_backup_script {
2814 2828
   echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2815 2829
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2816 2830
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2817
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'voip'
2831
+  echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup voip' >> /usr/bin/$BACKUP_SCRIPT_NAME
2818 2832
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2819 2833
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2820 2834
 
@@ -2836,7 +2850,7 @@ function create_backup_script {
2836 2850
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2837 2851
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2838 2852
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2839
-      backup_directory_to_usb '/root/tempmariadb' 'mariadb'
2853
+      echo 'backup_directory_to_usb /root/tempmariadb mariadb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2840 2854
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2841 2855
   fi
2842 2856
 
@@ -2847,7 +2861,7 @@ function create_backup_script {
2847 2861
   echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
2848 2862
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2849 2863
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
2850
-  backup_directory_to_usb '/var/lib/tox-bootstrapd' 'tox'
2864
+  echo '  backup_directory_to_usb /var/lib/tox-bootstrapd tox' >> /usr/bin/$BACKUP_SCRIPT_NAME
2851 2865
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2852 2866
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2853 2867
 
@@ -9851,7 +9865,7 @@ function create_upgrade_script {
9851 9865
   echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
9852 9866
   echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
9853 9867
   echo "  chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
9854
-  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME      
9868
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
9855 9869
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
9856 9870
   echo "if grep -Fxq \"install_gnu_social\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
9857 9871
   echo '  # GNU Social' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
@@ -10250,7 +10264,7 @@ function install_ipfs {
10250 10264
   fi
10251 10265
   apt-get -y install golang libpam0g-dev fuse
10252 10266
 
10253
-  if [ ! -d /home/git ]; then  
10267
+  if [ ! -d /home/git ]; then
10254 10268
       # add a gogs user account
10255 10269
       adduser --disabled-login --gecos 'Gogs' git
10256 10270
 
@@ -10279,7 +10293,7 @@ function install_ipfs {
10279 10293
       echo 'export PATH="$PATH:/usr/local/opt/go/libexec/bin";' >> /home/$MY_USERNAME/.bashrc
10280 10294
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.bashrc
10281 10295
   fi
10282
-  
10296
+
10283 10297
   go get -u github.com/ipfs/go-ipfs/cmd/ipfs
10284 10298
   if [ ! "$?" = "0" ]; then
10285 10299
       exit 8242
@@ -10317,7 +10331,7 @@ function install_ipfs {
10317 10331
   if [ -f /dev/fuse ]; then
10318 10332
       chown $MY_USERNAME:$MY_USERNAME /dev/fuse
10319 10333
   fi
10320
-  
10334
+
10321 10335
   echo '[Unit]' > /etc/systemd/system/ipfs.service
10322 10336
   echo 'Description=IPFS daemon' >> /etc/systemd/system/ipfs.service
10323 10337
   echo 'After=syslog.target' >> /etc/systemd/system/ipfs.service
@@ -10334,7 +10348,7 @@ function install_ipfs {
10334 10348
   echo '' >> /etc/systemd/system/ipfs.service
10335 10349
   echo '[Install]' >> /etc/systemd/system/ipfs.service
10336 10350
   echo 'WantedBy=multi-user.target' >> /etc/systemd/system/ipfs.service
10337
-  
10351
+
10338 10352
   systemctl enable ipfs
10339 10353
   systemctl daemon-reload
10340 10354
   systemctl restart ipfs