| 
				
			 | 
			
			
				@@ -2931,7 +2931,7 @@ function install_owncloud { 
			 | 
		
	
		
			
			| 
				2931
			 | 
			
				2931
			 | 
			
			
				           return 
			 | 
		
	
		
			
			| 
				2932
			 | 
			
				2932
			 | 
			
			
				       fi 
			 | 
		
	
		
			
			| 
				2933
			 | 
			
				2933
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2934
			 | 
			
				
			 | 
			
			
				-  apt-get -y --force-yes owncloud 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2934
			 | 
			
			
				+  apt-get -y --force-yes install owncloud 
			 | 
		
	
		
			
			| 
				2935
			 | 
			
				2935
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2936
			 | 
			
				2936
			 | 
			
			
				   if [ ! -d /var/www/$OWNCLOUD_DOMAIN_NAME ]; then 
			 | 
		
	
		
			
			| 
				2937
			 | 
			
				2937
			 | 
			
			
				       mkdir /var/www/$OWNCLOUD_DOMAIN_NAME 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -3236,7 +3236,7 @@ function install_wiki { 
			 | 
		
	
		
			
			| 
				3236
			 | 
			
				3236
			 | 
			
			
				   if [ ! $WIKI_DOMAIN_NAME ]; then 
			 | 
		
	
		
			
			| 
				3237
			 | 
			
				3237
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				3238
			 | 
			
				3238
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				3239
			 | 
			
				
			 | 
			
			
				-  apt-get -y --force-yes instal dokuwiki 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3239
			 | 
			
			
				+  apt-get -y --force-yes install dokuwiki 
			 | 
		
	
		
			
			| 
				3240
			 | 
			
				3240
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				3241
			 | 
			
				3241
			 | 
			
			
				   if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then 
			 | 
		
	
		
			
			| 
				3242
			 | 
			
				3242
			 | 
			
			
				       mkdir /var/www/$WIKI_DOMAIN_NAME 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -4534,6 +4534,27 @@ function create_upgrade_script { 
			 | 
		
	
		
			
			| 
				4534
			 | 
			
				4534
			 | 
			
			
				   echo 'create_upgrade_script' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				4535
			 | 
			
				4535
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				4536
			 | 
			
				4536
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				4537
			 | 
			
			
				+function intrusion_detection { 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4538
			 | 
			
			
				+  if grep -Fxq "intrusion_detection" $COMPLETION_FILE; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4539
			 | 
			
			
				+      return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4540
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4541
			 | 
			
			
				+  apt-get install tripwire 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4542
			 | 
			
			
				+  apt-get -y --force-yes autoremove 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4543
			 | 
			
			
				+  cd /etc/tripwire 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4544
			 | 
			
			
				+  cp arm-local.key $DOMAIN_NAME-local.key 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4545
			 | 
			
			
				+  cp site.key $DOMAIN_NAME-site.key 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4546
			 | 
			
			
				+  echo '' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4547
			 | 
			
			
				+  echo '' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4548
			 | 
			
			
				+  echo '*** Installing intrusion detection. You should create a couple of passwords for this. ***' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4549
			 | 
			
			
				+  echo '' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4550
			 | 
			
			
				+  echo '' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4551
			 | 
			
			
				+  tripwire --init 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4552
			 | 
			
			
				+  tripwire --update-policy --secure-mode low /etc/tripwire/twpol.txt 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4553
			 | 
			
			
				+  tripwire --check 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4554
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4555
			 | 
			
			
				+  echo 'intrusion_detection' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4556
			 | 
			
			
				+} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4557
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				4537
			 | 
			
				4558
			 | 
			
			
				 function install_final { 
			 | 
		
	
		
			
			| 
				4538
			 | 
			
				4559
			 | 
			
			
				   if grep -Fxq "install_final" $COMPLETION_FILE; then 
			 | 
		
	
		
			
			| 
				4539
			 | 
			
				4560
			 | 
			
			
				       return 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -4543,7 +4564,6 @@ function install_final { 
			 | 
		
	
		
			
			| 
				4543
			 | 
			
				4564
			 | 
			
			
				       umount $USB_MOUNT 
			 | 
		
	
		
			
			| 
				4544
			 | 
			
				4565
			 | 
			
			
				       rm -rf $USB_MOUNT 
			 | 
		
	
		
			
			| 
				4545
			 | 
			
				4566
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				4546
			 | 
			
				
			 | 
			
			
				-  apt-get -y --force-yes autoremove 
			 | 
		
	
		
			
			| 
				4547
			 | 
			
				4567
			 | 
			
			
				   echo 'install_final' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				4548
			 | 
			
				4568
			 | 
			
			
				   echo '' 
			 | 
		
	
		
			
			| 
				4549
			 | 
			
				4569
			 | 
			
			
				   echo '  *** Freedombone installation is complete. Rebooting... ***' 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -4617,7 +4637,7 @@ create_backup_script 
			 | 
		
	
		
			
			| 
				4617
			 | 
			
				4637
			 | 
			
			
				 create_restore_script 
			 | 
		
	
		
			
			| 
				4618
			 | 
			
				4638
			 | 
			
			
				 backup_to_friends_servers 
			 | 
		
	
		
			
			| 
				4619
			 | 
			
				4639
			 | 
			
			
				 restore_from_friend 
			 | 
		
	
		
			
			| 
				
			 | 
			
				4640
			 | 
			
			
				+intrusion_detection 
			 | 
		
	
		
			
			| 
				4620
			 | 
			
				4641
			 | 
			
			
				 install_final 
			 | 
		
	
		
			
			| 
				4621
			 | 
			
				
			 | 
			
			
				-apt-get -y --force-yes autoremove 
			 | 
		
	
		
			
			| 
				4622
			 | 
			
				4642
			 | 
			
			
				 echo 'Freedombone installation is complete' 
			 | 
		
	
		
			
			| 
				4623
			 | 
			
				4643
			 | 
			
			
				 exit 0 
			 |