| 
				
			 | 
			
			
				@@ -97,7 +97,7 @@ function backup_local_radicale { 
			 | 
		
	
		
			
			| 
				97
			 | 
			
				97
			 | 
			
			
				         function_check backup_directory_to_usb 
			 | 
		
	
		
			
			| 
				98
			 | 
			
				98
			 | 
			
			
				         backup_directory_to_usb $source_directory $dest_directory 
			 | 
		
	
		
			
			| 
				99
			 | 
			
				99
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				100
			 | 
			
				
			 | 
			
			
				-    source_directory=/var/www/radicale/collections 
			 | 
		
	
		
			
			| 
				
			 | 
			
				100
			 | 
			
			
				+    source_directory=/var/www/radicale 
			 | 
		
	
		
			
			| 
				101
			 | 
			
				101
			 | 
			
			
				     if [ -d $source_directory ]; then 
			 | 
		
	
		
			
			| 
				102
			 | 
			
				102
			 | 
			
			
				         dest_directory=radicalecollections 
			 | 
		
	
		
			
			| 
				103
			 | 
			
				103
			 | 
			
			
				         function_check backup_directory_to_usb 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -120,7 +120,7 @@ function restore_local_radicale { 
			 | 
		
	
		
			
			| 
				120
			 | 
			
				120
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				121
			 | 
			
				121
			 | 
			
			
				         temp_restore_dir=/root/tempradicalecollections 
			 | 
		
	
		
			
			| 
				122
			 | 
			
				122
			 | 
			
			
				         restore_directory_from_usb $temp_restore_dir radicalecollections 
			 | 
		
	
		
			
			| 
				123
			 | 
			
				
			 | 
			
			
				-        cp -r $temp_restore_dir/var/www/radicale/collections/* /var/www/radicale/collections 
			 | 
		
	
		
			
			| 
				
			 | 
			
				123
			 | 
			
			
				+        cp -r $temp_restore_dir/var/www/radicale/* /var/www/radicale 
			 | 
		
	
		
			
			| 
				124
			 | 
			
				124
			 | 
			
			
				         if [ ! "$?" = "0" ]; then 
			 | 
		
	
		
			
			| 
				125
			 | 
			
				125
			 | 
			
			
				             function_check backup_unmount_drive 
			 | 
		
	
		
			
			| 
				126
			 | 
			
				126
			 | 
			
			
				             backup_unmount_drive 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -137,7 +137,7 @@ function backup_remote_radicale { 
			 | 
		
	
		
			
			| 
				137
			 | 
			
				137
			 | 
			
			
				     if [ -d ${RADICALE_DIRECTORY} ]; then 
			 | 
		
	
		
			
			| 
				138
			 | 
			
				138
			 | 
			
			
				         echo $"Backing up the radicale settings" 
			 | 
		
	
		
			
			| 
				139
			 | 
			
				139
			 | 
			
			
				         backup_directory_to_friend ${RADICALE_DIRECTORY} radicale 
			 | 
		
	
		
			
			| 
				140
			 | 
			
				
			 | 
			
			
				-        backup_directory_to_friend /var/www/radicale/collections radicalecollections 
			 | 
		
	
		
			
			| 
				
			 | 
			
				140
			 | 
			
			
				+        backup_directory_to_friend /var/www/radicale radicalecollections 
			 | 
		
	
		
			
			| 
				141
			 | 
			
				141
			 | 
			
			
				         echo $"Backup of radicale settings complete" 
			 | 
		
	
		
			
			| 
				142
			 | 
			
				142
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				143
			 | 
			
				143
			 | 
			
			
				 } 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -155,7 +155,7 @@ function restore_remote_radicale { 
			 | 
		
	
		
			
			| 
				155
			 | 
			
				155
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				156
			 | 
			
				156
			 | 
			
			
				         temp_restore_dir=/root/tempradicalecollections 
			 | 
		
	
		
			
			| 
				157
			 | 
			
				157
			 | 
			
			
				         restore_directory_from_friend $temp_restore_dir radicalecollections 
			 | 
		
	
		
			
			| 
				158
			 | 
			
				
			 | 
			
			
				-        cp -r $temp_restore_dir/var/www/radicale/collections/* /var/www/radicale/collections 
			 | 
		
	
		
			
			| 
				
			 | 
			
				158
			 | 
			
			
				+        cp -r $temp_restore_dir/var/www/radicale/* /var/www/radicale 
			 | 
		
	
		
			
			| 
				159
			 | 
			
				159
			 | 
			
			
				         if [ ! "$?" = "0" ]; then 
			 | 
		
	
		
			
			| 
				160
			 | 
			
				160
			 | 
			
			
				             exit 3674284 
			 | 
		
	
		
			
			| 
				161
			 | 
			
				161
			 | 
			
			
				         fi 
			 |