| 
				
			 | 
			
			
				@@ -219,6 +219,9 @@ UPGRADE_SCRIPT_NAME="freedombone-upgrade" 
			 | 
		
	
		
			
			| 
				219
			 | 
			
				219
			 | 
			
			
				 # name of a script which keeps running processes going even if they crash 
			 | 
		
	
		
			
			| 
				220
			 | 
			
				220
			 | 
			
			
				 WATCHDOG_SCRIPT_NAME="keepon" 
			 | 
		
	
		
			
			| 
				221
			 | 
			
				221
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				222
			 | 
			
			
				+# the type of backup system used 
			 | 
		
	
		
			
			| 
				
			 | 
			
				223
			 | 
			
			
				+BACKUP_TYPE='rsync' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				224
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				222
			 | 
			
				225
			 | 
			
			
				 # Name of a script used to create a backup of the system on usb drive 
			 | 
		
	
		
			
			| 
				223
			 | 
			
				226
			 | 
			
			
				 BACKUP_SCRIPT_NAME="backup" 
			 | 
		
	
		
			
			| 
				224
			 | 
			
				227
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -776,6 +779,9 @@ function read_configuration { 
			 | 
		
	
		
			
			| 
				776
			 | 
			
				779
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				777
			 | 
			
				780
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				778
			 | 
			
				781
			 | 
			
			
				   if [ -f $CONFIGURATION_FILE ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				782
			 | 
			
			
				+      if grep -q "BACKUP_TYPE" $CONFIGURATION_FILE; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				783
			 | 
			
			
				+          BACKUP_TYPE=$(grep "BACKUP_TYPE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				784
			 | 
			
			
				+      fi 
			 | 
		
	
		
			
			| 
				779
			 | 
			
				785
			 | 
			
			
				       if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then 
			 | 
		
	
		
			
			| 
				780
			 | 
			
				786
			 | 
			
			
				           TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') 
			 | 
		
	
		
			
			| 
				781
			 | 
			
				787
			 | 
			
			
				       fi 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2409,25 +2415,23 @@ function get_mariadb_owncloud_admin_password { 
			 | 
		
	
		
			
			| 
				2409
			 | 
			
				2415
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2410
			 | 
			
				2416
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				2411
			 | 
			
				2417
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2412
			 | 
			
				
			 | 
			
			
				-BACKUP_TYPE='rsync' 
			 | 
		
	
		
			
			| 
				2413
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				2414
			 | 
			
				2418
			 | 
			
			
				 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 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2419
			 | 
			
			
				+  if [[ $BACKUP_TYPE == 'rsync' ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2420
			 | 
			
			
				+      echo "rsyncrypto -v -r ${1} $USB_MOUNT/backup/${2} $USB_MOUNT/backup/${2}.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2421
			 | 
			
			
				+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2422
			 | 
			
			
				+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2423
			 | 
			
			
				+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2424
			 | 
			
			
				+      if [[ ${1} == "/root/temp"* ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2425
			 | 
			
			
				+          echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2426
			 | 
			
			
				+          echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2427
			 | 
			
			
				+      fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2428
			 | 
			
			
				+      echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2429
			 | 
			
			
				+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2430
			 | 
			
			
				+      if [[ ${1} == "/root/temp"* ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2431
			 | 
			
			
				+          echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2432
			 | 
			
			
				+          echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2433
			 | 
			
			
				+      fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2434
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				2431
			 | 
			
				2435
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				2432
			 | 
			
				2436
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2433
			 | 
			
				2437
			 | 
			
			
				 # For rsyncrypto usage see http://archive09.linux.com/feature/125322 
			 |