| 
				
			 | 
			
			
				@@ -2084,6 +2084,7 @@ function install_wiki { 
			 | 
		
	
		
			
			| 
				2084
			 | 
			
				2084
			 | 
			
			
				       echo 'Once you have set up the wiki then remove the install file:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2085
			 | 
			
				2085
			 | 
			
			
				       echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2086
			 | 
			
				2086
			 | 
			
			
				       echo "  rm /var/www/$WIKI_DOMAIN_NAME/htdocs/install.php" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2087
			 | 
			
			
				+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2087
			 | 
			
				2088
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2088
			 | 
			
				2089
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2089
			 | 
			
				2090
			 | 
			
			
				   echo 'install_wiki' >> $COMPLETION_FILE 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2207,6 +2208,7 @@ function install_blog { 
			 | 
		
	
		
			
			| 
				2207
			 | 
			
				2208
			 | 
			
			
				       echo '  * [[:contact|Contact]]' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2208
			 | 
			
				2209
			 | 
			
			
				       echo "Go to https://$WIKI_DOMAIN_NAME/doku.php?id=start&do=admin&page=config" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2209
			 | 
			
				2210
			 | 
			
			
				       echo 'and check "Show header navigation" to ensure that the header shows' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2211
			 | 
			
			
				+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2210
			 | 
			
				2212
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2211
			 | 
			
				2213
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2212
			 | 
			
				2214
			 | 
			
			
				   echo 'install_blog' >> $COMPLETION_FILE 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2472,6 +2474,7 @@ quit" > $INSTALL_DIR/batch.sql 
			 | 
		
	
		
			
			| 
				2472
			 | 
			
				2474
			 | 
			
			
				       echo 'Under the *Access* settings:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2473
			 | 
			
				2475
			 | 
			
			
				       echo '    /Invite only/ ticked' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2474
			 | 
			
				2476
			 | 
			
			
				       echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2477
			 | 
			
			
				+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				2475
			 | 
			
				2478
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2476
			 | 
			
				2479
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2477
			 | 
			
				2480
			 | 
			
			
				   echo 'install_gnu_social' >> $COMPLETION_FILE 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2664,6 +2667,25 @@ quit" > $INSTALL_DIR/batch.sql 
			 | 
		
	
		
			
			| 
				2664
			 | 
			
				2667
			 | 
			
			
				   service nginx restart 
			 | 
		
	
		
			
			| 
				2665
			 | 
			
				2668
			 | 
			
			
				   service cron restart 
			 | 
		
	
		
			
			| 
				2666
			 | 
			
				2669
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				2670
			 | 
			
			
				+  # some post-install instructions for the user 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2671
			 | 
			
			
				+  if ! grep -q "To set up your Red Matrix" /home/$MY_USERNAME/README; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2672
			 | 
			
			
				+      echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2673
			 | 
			
			
				+      echo "To set up your Red Matrix site go to" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2674
			 | 
			
			
				+      echo "https://$REDMATRIX_DOMAIN_NAME" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2675
			 | 
			
			
				+	  echo 'You will need to have a non self-signed SSL certificate in order' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2676
			 | 
			
			
				+	  echo "to use Red Matrix. Put the public certificate in /etc/ssl/certs/$REDMATRIX_DOMAIN_NAME.crt" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2677
			 | 
			
			
				+	  echo "and the private certificate in /etc/ssl/private/$REDMATRIX_DOMAIN_NAME.key." >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2678
			 | 
			
			
				+	  echo 'If there is an intermediate certificate needed (such as with StartSSL) then' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2679
			 | 
			
			
				+      echo 'this will need to be concatenated onto the end of the crt file, like this:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2680
			 | 
			
			
				+	  echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2681
			 | 
			
			
				+      echo "  cat /etc/ssl/certs/$REDMATRIX_DOMAIN_NAME.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem > /etc/ssl/certs/$REDMATRIX_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2682
			 | 
			
			
				+	  echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2683
			 | 
			
			
				+	  echo "Then change ssl_certificate to /etc/ssl/certs/$REDMATRIX_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2684
			 | 
			
			
				+	  echo "within /etc/nginx/sites-available/$REDMATRIX_DOMAIN_NAME" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2685
			 | 
			
			
				+      echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2686
			 | 
			
			
				+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2687
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2688
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				2667
			 | 
			
				2689
			 | 
			
			
				   echo 'install_redmatrix' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				2668
			 | 
			
				2690
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				2669
			 | 
			
				2691
			 | 
			
			
				  
			 |