| 
				
			 | 
			
			
				@@ -8518,32 +8518,29 @@ function install_gnu_social { 
			 | 
		
	
		
			
			| 
				8518
			 | 
			
				8518
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				8519
			 | 
			
				8519
			 | 
			
			
				     nginx_ensite $MICROBLOG_DOMAIN_NAME 
			 | 
		
	
		
			
			| 
				8520
			 | 
			
				8520
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				8521
			 | 
			
			
				+    # NOTE: For the typical case always enable SSL and only 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8522
			 | 
			
			
				+    # disable it if in onion only mode. This is due to complexities 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8523
			 | 
			
			
				+    # with the way URLs are generated by GNU Social 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8524
			 | 
			
			
				+    gnu_social_ssl='always' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8525
			 | 
			
			
				+    if [[ $ONION_ONLY != 'no' ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8526
			 | 
			
			
				+        gnu_social_ssl='never' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8527
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8528
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				8521
			 | 
			
				8529
			 | 
			
			
				     # Create the configuration 
			 | 
		
	
		
			
			| 
				8522
			 | 
			
				
			 | 
			
			
				-    #echo '<?php' > /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8523
			 | 
			
				
			 | 
			
			
				-    #echo "if (!defined('GNUSOCIAL')) { exit(1); }" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8524
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8525
			 | 
			
				
			 | 
			
			
				-    #echo "$config['site']['name'] = 'Freedombone Social';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8526
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8527
			 | 
			
				
			 | 
			
			
				-    #echo "$config['site']['server'] = '$MICROBLOG_DOMAIN_NAME';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8528
			 | 
			
				
			 | 
			
			
				-    #echo "$config['site']['path'] = false;" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8529
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8530
			 | 
			
				
			 | 
			
			
				-    #if [[ $ONION_ONLY == "no" ]]; then 
			 | 
		
	
		
			
			| 
				8531
			 | 
			
				
			 | 
			
			
				-    #    echo "$config['site']['ssl'] = 'always'; " >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8532
			 | 
			
				
			 | 
			
			
				-    #else 
			 | 
		
	
		
			
			| 
				8533
			 | 
			
				
			 | 
			
			
				-    #    echo "$config['site']['ssl'] = 'never'; " >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8534
			 | 
			
				
			 | 
			
			
				-    #fi 
			 | 
		
	
		
			
			| 
				8535
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8536
			 | 
			
				
			 | 
			
			
				-    #echo "$config['site']['fancy'] = true;" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8537
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8538
			 | 
			
				
			 | 
			
			
				-    #echo "$config['db']['database'] = 'mysqli://root:${MARIADB_PASSWORD}@localhost/gnusocial';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8539
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8540
			 | 
			
				
			 | 
			
			
				-    #echo "$config['db']['type'] = 'mysql';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8541
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8542
			 | 
			
				
			 | 
			
			
				-    #echo '// Uncomment below for better performance. Just remember you must run' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8543
			 | 
			
				
			 | 
			
			
				-    #echo '// php scripts/checkschema.php whenever your enabled plugins change!' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8544
			 | 
			
				
			 | 
			
			
				-    #echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8545
			 | 
			
				
			 | 
			
			
				-    #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				8546
			 | 
			
				
			 | 
			
			
				-    #echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8530
			 | 
			
			
				+    gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8531
			 | 
			
			
				+    ${gnu_social_installer} --host="localhost" --database="gnusocial" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8532
			 | 
			
			
				+                            --dbtype=mysql --username="root" -v \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8533
			 | 
			
			
				+                            --password="$MARIADB_PASSWORD" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8534
			 | 
			
			
				+                            --sitename="My Social Network" --fancy \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8535
			 | 
			
			
				+                            --admin-nick="gnusocialadmin" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8536
			 | 
			
			
				+                            --admin-pass="$MICROBLOG_ADMIN_PASSWORD" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8537
			 | 
			
			
				+                            --site-profile="community" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8538
			 | 
			
			
				+                            --ssl=${gnu_social_ssl} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8539
			 | 
			
			
				+    if [ ! "$?" = "0" ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8540
			 | 
			
			
				+        # failed to install 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8541
			 | 
			
			
				+        echo $'Could not install GNU Social' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8542
			 | 
			
			
				+        exit 72357 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8543
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				8547
			 | 
			
				8544
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				8548
			 | 
			
				8545
			 | 
			
			
				     MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT}) 
			 | 
		
	
		
			
			| 
				8549
			 | 
			
				8546
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -8564,33 +8561,8 @@ function install_gnu_social { 
			 | 
		
	
		
			
			| 
				8564
			 | 
			
				8561
			 | 
			
			
				         echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8565
			 | 
			
				8562
			 | 
			
			
				         echo $'Microblog' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8566
			 | 
			
				8563
			 | 
			
			
				         echo '=========' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8567
			 | 
			
				
			 | 
			
			
				-        echo $"To set up your microblog go to" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8568
			 | 
			
				
			 | 
			
			
				-        echo $"https://$MICROBLOG_DOMAIN_NAME/install.php" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8569
			 | 
			
				
			 | 
			
			
				-        echo $'and enter the following settings:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8570
			 | 
			
				
			 | 
			
			
				-        echo $' - Set a name for the site' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8571
			 | 
			
				
			 | 
			
			
				-        echo $' - Server SSL: enable' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8572
			 | 
			
				
			 | 
			
			
				-        echo $' - Hostname: localhost' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8573
			 | 
			
				
			 | 
			
			
				-        echo $' - Type: MySql/MariaDB' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8574
			 | 
			
				
			 | 
			
			
				-        echo $' - Name: gnusocial' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8575
			 | 
			
				
			 | 
			
			
				-        echo $' - DB username: root' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8576
			 | 
			
				
			 | 
			
			
				-        echo $" - DB Password; $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8577
			 | 
			
				
			 | 
			
			
				-        echo $" - Administrator nickname: $MY_USERNAME" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8578
			 | 
			
				
			 | 
			
			
				-        echo $" - Administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8579
			 | 
			
				
			 | 
			
			
				-        echo $' - Subscribe to announcements: ticked' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8580
			 | 
			
				
			 | 
			
			
				-        echo $' - Site profile: Community' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8581
			 | 
			
				
			 | 
			
			
				-        echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8582
			 | 
			
				
			 | 
			
			
				-        echo $'When the install is complete you will see a lot of warnings' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8583
			 | 
			
				
			 | 
			
			
				-        echo $'but just ignore those and navigate to ' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8584
			 | 
			
				
			 | 
			
			
				-        echo $"https://$MICROBLOG_DOMAIN_NAME and you can then " >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8585
			 | 
			
				
			 | 
			
			
				-        echo $'complete the configuration via the *Admin* section on the header' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8586
			 | 
			
				
			 | 
			
			
				-        echo $'bar.  Some recommended admin settings are:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8587
			 | 
			
				
			 | 
			
			
				-        echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8588
			 | 
			
				
			 | 
			
			
				-        echo $'Under the *Site* settings:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8589
			 | 
			
				
			 | 
			
			
				-        echo '    Text limit: 140' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8590
			 | 
			
				
			 | 
			
			
				-        echo '    Dupe Limit: 60000' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8591
			 | 
			
				
			 | 
			
			
				-        echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8592
			 | 
			
				
			 | 
			
			
				-        echo $'Under the *User* settings:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8593
			 | 
			
				
			 | 
			
			
				-        echo '    Bio limit: 1000' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8564
			 | 
			
			
				+        echo $"Microblog administrator nickname: gnusocialadmin" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				8565
			 | 
			
			
				+        echo $"Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8594
			 | 
			
				8566
			 | 
			
			
				         echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8595
			 | 
			
				8567
			 | 
			
			
				         echo $'Under the *Access* settings:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				8596
			 | 
			
				8568
			 | 
			
			
				         echo '    /Invite only/ ticked' >> /home/$MY_USERNAME/README 
			 |