| 
				
			 | 
			
			
				@@ -42,6 +42,9 @@ INSTALLING_ON_BBB="no" 
			 | 
		
	
		
			
			| 
				42
			 | 
			
				42
			 | 
			
			
				 # Version number of this script 
			 | 
		
	
		
			
			| 
				43
			 | 
			
				43
			 | 
			
			
				 VERSION="1.01" 
			 | 
		
	
		
			
			| 
				44
			 | 
			
				44
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				45
			 | 
			
			
				+# whether to enable hubzilla or redmatrix 
			 | 
		
	
		
			
			| 
				
			 | 
			
				46
			 | 
			
			
				+ENABLE_HUBZILLA="no" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				47
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				45
			 | 
			
				48
			 | 
			
			
				 # Different system variants which may be specified within 
			 | 
		
	
		
			
			| 
				46
			 | 
			
				49
			 | 
			
			
				 # the SYSTEM_TYPE option 
			 | 
		
	
		
			
			| 
				47
			 | 
			
				50
			 | 
			
			
				 VARIANT_FULL="full" 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -789,6 +792,9 @@ function read_configuration { 
			 | 
		
	
		
			
			| 
				789
			 | 
			
				792
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				790
			 | 
			
				793
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				791
			 | 
			
				794
			 | 
			
			
				   if [ -f $CONFIGURATION_FILE ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				795
			 | 
			
			
				+      if grep -q "ENABLE_HUBZILLA" $CONFIGURATION_FILE; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				796
			 | 
			
			
				+          ENABLE_HUBZILLA=$(grep "ENABLE_HUBZILLA" $CONFIGURATION_FILE | awk -F '=' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				797
			 | 
			
			
				+      fi 
			 | 
		
	
		
			
			| 
				792
			 | 
			
				798
			 | 
			
			
				       if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then 
			 | 
		
	
		
			
			| 
				793
			 | 
			
				799
			 | 
			
			
				           TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') 
			 | 
		
	
		
			
			| 
				794
			 | 
			
				800
			 | 
			
			
				       fi 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -9869,6 +9875,9 @@ function install_redmatrix { 
			 | 
		
	
		
			
			| 
				9869
			 | 
			
				9875
			 | 
			
			
				   if [ ! $REDMATRIX_DOMAIN_NAME ]; then 
			 | 
		
	
		
			
			| 
				9870
			 | 
			
				9876
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				9871
			 | 
			
				9877
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9878
			 | 
			
			
				+  if [[ $ENABLE_HUBZILLA != "no" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9879
			 | 
			
			
				+      return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9880
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				9872
			 | 
			
				9881
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				9873
			 | 
			
				9882
			 | 
			
			
				   install_mariadb 
			 | 
		
	
		
			
			| 
				9874
			 | 
			
				9883
			 | 
			
			
				   get_mariadb_password 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -10135,6 +10144,9 @@ function install_hubzilla { 
			 | 
		
	
		
			
			| 
				10135
			 | 
			
				10144
			 | 
			
			
				   if [ ! $HUBZILLA_DOMAIN_NAME ]; then 
			 | 
		
	
		
			
			| 
				10136
			 | 
			
				10145
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				10137
			 | 
			
				10146
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				10147
			 | 
			
			
				+  if [[ $ENABLE_HUBZILLA == "no" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				10148
			 | 
			
			
				+      return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				10149
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				10138
			 | 
			
				10150
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				10139
			 | 
			
				10151
			 | 
			
			
				   install_mariadb 
			 | 
		
	
		
			
			| 
				10140
			 | 
			
				10152
			 | 
			
			
				   get_mariadb_password 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -11259,7 +11271,7 @@ install_wiki 
			 | 
		
	
		
			
			| 
				11259
			 | 
			
				11271
			 | 
			
			
				 install_blog 
			 | 
		
	
		
			
			| 
				11260
			 | 
			
				11272
			 | 
			
			
				 install_gnu_social 
			 | 
		
	
		
			
			| 
				11261
			 | 
			
				11273
			 | 
			
			
				 install_redmatrix 
			 | 
		
	
		
			
			| 
				11262
			 | 
			
				
			 | 
			
			
				-#install_hubzilla 
			 | 
		
	
		
			
			| 
				
			 | 
			
				11274
			 | 
			
			
				+install_hubzilla 
			 | 
		
	
		
			
			| 
				11263
			 | 
			
				11275
			 | 
			
			
				 install_dlna_server 
			 | 
		
	
		
			
			| 
				11264
			 | 
			
				11276
			 | 
			
			
				 configure_firewall_for_dlna 
			 | 
		
	
		
			
			| 
				11265
			 | 
			
				11277
			 | 
			
			
				 install_mediagoblin 
			 |