| 
				
			 | 
			
			
				@@ -71,6 +71,7 @@ VARIANT_CLOUD="cloud" 
			 | 
		
	
		
			
			| 
				71
			 | 
			
				71
			 | 
			
			
				 VARIANT_CHAT="chat" 
			 | 
		
	
		
			
			| 
				72
			 | 
			
				72
			 | 
			
			
				 VARIANT_MAILBOX="mailbox" 
			 | 
		
	
		
			
			| 
				73
			 | 
			
				73
			 | 
			
			
				 VARIANT_SOCIAL="social" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				74
			 | 
			
			
				+VARIANT_MEDIA="media" 
			 | 
		
	
		
			
			| 
				74
			 | 
			
				75
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				75
			 | 
			
				76
			 | 
			
			
				 SSH_PORT=2222 
			 | 
		
	
		
			
			| 
				76
			 | 
			
				77
			 | 
			
			
				 KERNEL_VERSION="v3.15.10-bone7" 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -196,7 +197,7 @@ function show_help { 
			 | 
		
	
		
			
			| 
				196
			 | 
			
				197
			 | 
			
			
				   echo '-----------' 
			 | 
		
	
		
			
			| 
				197
			 | 
			
				198
			 | 
			
			
				   echo 'This can either be blank if you wish to install the full system,' 
			 | 
		
	
		
			
			| 
				198
			 | 
			
				199
			 | 
			
			
				   echo "or for more specialised variants you can specify '$VARIANT_MAILBOX', '$VARIANT_CLOUD'," 
			 | 
		
	
		
			
			| 
				199
			 | 
			
				
			 | 
			
			
				-  echo "'$VARIANT_CHAT', '$VARIANT_SOCIAL' or '$VARIANT_WRITER'" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				200
			 | 
			
			
				+  echo "'$VARIANT_CHAT', '$VARIANT_SOCIAL', '$VARIANT_MEDIA' or '$VARIANT_WRITER'" 
			 | 
		
	
		
			
			| 
				200
			 | 
			
				201
			 | 
			
			
				   echo '' 
			 | 
		
	
		
			
			| 
				201
			 | 
			
				202
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				202
			 | 
			
				203
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -218,7 +219,7 @@ function argument_checks { 
			 | 
		
	
		
			
			| 
				218
			 | 
			
				219
			 | 
			
			
				       exit 4 
			 | 
		
	
		
			
			| 
				219
			 | 
			
				220
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				220
			 | 
			
				221
			 | 
			
			
				   if [ $SYSTEM_TYPE ]; then 
			 | 
		
	
		
			
			| 
				221
			 | 
			
				
			 | 
			
			
				-      if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				222
			 | 
			
			
				+      if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA ]]; then 
			 | 
		
	
		
			
			| 
				222
			 | 
			
				223
			 | 
			
			
				           echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant." 
			 | 
		
	
		
			
			| 
				223
			 | 
			
				224
			 | 
			
			
				           exit 30 
			 | 
		
	
		
			
			| 
				224
			 | 
			
				225
			 | 
			
			
				       fi 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -236,6 +237,14 @@ function change_login_message { 
			 | 
		
	
		
			
			| 
				236
			 | 
			
				237
			 | 
			
			
				   echo "|    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-' " >> /etc/motd 
			 | 
		
	
		
			
			| 
				237
			 | 
			
				238
			 | 
			
			
				   echo "'    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'" >> /etc/motd 
			 | 
		
	
		
			
			| 
				238
			 | 
			
				239
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				240
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				241
			 | 
			
			
				+      echo '                 .    .        .            ' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				242
			 | 
			
			
				+	  echo '                 |\  /|        |   o        ' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				243
			 | 
			
			
				+	  echo "                 | \/ | .-. .-.|   .  .-.   " 
			 | 
		
	
		
			
			| 
				
			 | 
			
				244
			 | 
			
			
				+	  echo "                 |    |(.-'(   |   | (   )  " 
			 | 
		
	
		
			
			| 
				
			 | 
			
				245
			 | 
			
			
				+	  echo "                 '    '  --' -' --'  - -' - " 
			 | 
		
	
		
			
			| 
				
			 | 
			
				246
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				247
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				239
			 | 
			
				248
			 | 
			
			
				   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then 
			 | 
		
	
		
			
			| 
				240
			 | 
			
				249
			 | 
			
			
				       echo '              .  .   .  .     .          ' >> /etc/motd 
			 | 
		
	
		
			
			| 
				241
			 | 
			
				250
			 | 
			
			
				       echo '               \  \ /  /   o _|_         ' >> /etc/motd 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -294,7 +303,7 @@ function search_for_attached_usb_drive { 
			 | 
		
	
		
			
			| 
				294
			 | 
			
				303
			 | 
			
			
				           mkdir /media/usb 
			 | 
		
	
		
			
			| 
				295
			 | 
			
				304
			 | 
			
			
				           mount $USB_DRIVE /media/usb 
			 | 
		
	
		
			
			| 
				296
			 | 
			
				305
			 | 
			
			
				       fi 
			 | 
		
	
		
			
			| 
				297
			 | 
			
				
			 | 
			
			
				-      if ! [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				306
			 | 
			
			
				+      if ! [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				298
			 | 
			
				307
			 | 
			
			
				           if [ -d /media/usb/Maildir ]; then 
			 | 
		
	
		
			
			| 
				299
			 | 
			
				308
			 | 
			
			
				               echo 'Maildir found on USB drive' 
			 | 
		
	
		
			
			| 
				300
			 | 
			
				309
			 | 
			
			
				               IMPORT_MAILDIR=/media/usb/Maildir 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -863,7 +872,7 @@ function configure_firewall_for_git { 
			 | 
		
	
		
			
			| 
				863
			 | 
			
				872
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				864
			 | 
			
				873
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				865
			 | 
			
				874
			 | 
			
			
				 function configure_firewall_for_email { 
			 | 
		
	
		
			
			| 
				866
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				875
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				867
			 | 
			
				876
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				868
			 | 
			
				877
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				869
			 | 
			
				878
			 | 
			
			
				   if grep -Fxq "configure_firewall_for_email" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -946,7 +955,7 @@ function script_to_make_self_signed_certificates { 
			 | 
		
	
		
			
			| 
				946
			 | 
			
				955
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				947
			 | 
			
				956
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				948
			 | 
			
				957
			 | 
			
			
				 function configure_email { 
			 | 
		
	
		
			
			| 
				949
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				958
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				950
			 | 
			
				959
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				951
			 | 
			
				960
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				952
			 | 
			
				961
			 | 
			
			
				   if grep -Fxq "configure_email" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1033,7 +1042,7 @@ function configure_email { 
			 | 
		
	
		
			
			| 
				1033
			 | 
			
				1042
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1034
			 | 
			
				1043
			 | 
			
			
				 function spam_filtering { 
			 | 
		
	
		
			
			| 
				1035
			 | 
			
				1044
			 | 
			
			
				   # NOTE: spamassassin installation currently doesn't work, sa-compile fails with a make error 23/09/2014 
			 | 
		
	
		
			
			| 
				1036
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1045
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1037
			 | 
			
				1046
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1038
			 | 
			
				1047
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1039
			 | 
			
				1048
			 | 
			
			
				   if grep -Fxq "spam_filtering" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1132,7 +1141,7 @@ function spam_filtering { 
			 | 
		
	
		
			
			| 
				1132
			 | 
			
				1141
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1133
			 | 
			
				1142
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1134
			 | 
			
				1143
			 | 
			
			
				 function configure_imap { 
			 | 
		
	
		
			
			| 
				1135
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1144
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1136
			 | 
			
				1145
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1137
			 | 
			
				1146
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1138
			 | 
			
				1147
			 | 
			
			
				   if grep -Fxq "configure_imap" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1160,7 +1169,7 @@ function configure_imap { 
			 | 
		
	
		
			
			| 
				1160
			 | 
			
				1169
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1161
			 | 
			
				1170
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1162
			 | 
			
				1171
			 | 
			
			
				 function configure_gpg { 
			 | 
		
	
		
			
			| 
				1163
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1172
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1164
			 | 
			
				1173
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1165
			 | 
			
				1174
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1166
			 | 
			
				1175
			 | 
			
			
				   if grep -Fxq "configure_gpg" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1221,7 +1230,7 @@ function configure_gpg { 
			 | 
		
	
		
			
			| 
				1221
			 | 
			
				1230
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1222
			 | 
			
				1231
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1223
			 | 
			
				1232
			 | 
			
			
				 function email_client { 
			 | 
		
	
		
			
			| 
				1224
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1233
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1225
			 | 
			
				1234
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1226
			 | 
			
				1235
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1227
			 | 
			
				1236
			 | 
			
			
				   if grep -Fxq "email_client" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1327,7 +1336,7 @@ function email_client { 
			 | 
		
	
		
			
			| 
				1327
			 | 
			
				1336
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1328
			 | 
			
				1337
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1329
			 | 
			
				1338
			 | 
			
			
				 function folders_for_mailing_lists { 
			 | 
		
	
		
			
			| 
				1330
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1339
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1331
			 | 
			
				1340
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1332
			 | 
			
				1341
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1333
			 | 
			
				1342
			 | 
			
			
				   if grep -Fxq "folders_for_mailing_lists" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1376,7 +1385,7 @@ function folders_for_mailing_lists { 
			 | 
		
	
		
			
			| 
				1376
			 | 
			
				1385
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1377
			 | 
			
				1386
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1378
			 | 
			
				1387
			 | 
			
			
				 function folders_for_email_addresses { 
			 | 
		
	
		
			
			| 
				1379
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1388
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1380
			 | 
			
				1389
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1381
			 | 
			
				1390
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1382
			 | 
			
				1391
			 | 
			
			
				   if grep -Fxq "folders_for_email_addresses" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1443,7 +1452,7 @@ function dynamic_dns_freedns { 
			 | 
		
	
		
			
			| 
				1443
			 | 
			
				1452
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1444
			 | 
			
				1453
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1445
			 | 
			
				1454
			 | 
			
			
				 function create_private_mailing_list { 
			 | 
		
	
		
			
			| 
				1446
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1455
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1447
			 | 
			
				1456
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1448
			 | 
			
				1457
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1449
			 | 
			
				1458
			 | 
			
			
				   # This installation doesn't work, results in ruby errors 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1504,7 +1513,7 @@ function create_private_mailing_list { 
			 | 
		
	
		
			
			| 
				1504
			 | 
			
				1513
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1505
			 | 
			
				1514
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1506
			 | 
			
				1515
			 | 
			
			
				 function import_email { 
			 | 
		
	
		
			
			| 
				1507
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1516
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1508
			 | 
			
				1517
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1509
			 | 
			
				1518
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1510
			 | 
			
				1519
			 | 
			
			
				   EMAIL_COMPLETE_MSG='  *** Freedombone mailbox installation is complete ***' 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1581,7 +1590,7 @@ function configure_php { 
			 | 
		
	
		
			
			| 
				1581
			 | 
			
				1590
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1582
			 | 
			
				1591
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1583
			 | 
			
				1592
			 | 
			
			
				 function install_owncloud { 
			 | 
		
	
		
			
			| 
				1584
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1593
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1585
			 | 
			
				1594
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1586
			 | 
			
				1595
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1587
			 | 
			
				1596
			 | 
			
			
				   OWNCLOUD_COMPLETION_MSG1=" *** Freedombone $SYSTEM_TYPE is now installed ***" 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1773,7 +1782,7 @@ function install_owncloud { 
			 | 
		
	
		
			
			| 
				1773
			 | 
			
				1782
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1774
			 | 
			
				1783
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1775
			 | 
			
				1784
			 | 
			
			
				 function install_xmpp { 
			 | 
		
	
		
			
			| 
				1776
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1785
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1777
			 | 
			
				1786
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1778
			 | 
			
				1787
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1779
			 | 
			
				1788
			 | 
			
			
				   if grep -Fxq "install_xmpp" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1842,7 +1851,7 @@ function install_xmpp { 
			 | 
		
	
		
			
			| 
				1842
			 | 
			
				1851
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1843
			 | 
			
				1852
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1844
			 | 
			
				1853
			 | 
			
			
				 function install_irc_server { 
			 | 
		
	
		
			
			| 
				1845
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1854
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1846
			 | 
			
				1855
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1847
			 | 
			
				1856
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1848
			 | 
			
				1857
			 | 
			
			
				   if grep -Fxq "install_irc_server" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1885,7 +1894,7 @@ function install_irc_server { 
			 | 
		
	
		
			
			| 
				1885
			 | 
			
				1894
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1886
			 | 
			
				1895
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1887
			 | 
			
				1896
			 | 
			
			
				 function install_wiki { 
			 | 
		
	
		
			
			| 
				1888
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1897
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				1889
			 | 
			
				1898
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				1890
			 | 
			
				1899
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				1891
			 | 
			
				1900
			 | 
			
			
				   if grep -Fxq "install_wiki" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2091,7 +2100,7 @@ function install_wiki { 
			 | 
		
	
		
			
			| 
				2091
			 | 
			
				2100
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				2092
			 | 
			
				2101
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				2093
			 | 
			
				2102
			 | 
			
			
				 function install_blog { 
			 | 
		
	
		
			
			| 
				2094
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2103
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				2095
			 | 
			
				2104
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				2096
			 | 
			
				2105
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2097
			 | 
			
				2106
			 | 
			
			
				   if grep -Fxq "install_blog" $COMPLETION_FILE; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2268,7 +2277,7 @@ function install_gnu_social { 
			 | 
		
	
		
			
			| 
				2268
			 | 
			
				2277
			 | 
			
			
				   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then 
			 | 
		
	
		
			
			| 
				2269
			 | 
			
				2278
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				2270
			 | 
			
				2279
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2271
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2280
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				2272
			 | 
			
				2281
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				2273
			 | 
			
				2282
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2274
			 | 
			
				2283
			 | 
			
			
				   if [ ! $MICROBLOG_DOMAIN_NAME ]; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2484,7 +2493,7 @@ function install_redmatrix { 
			 | 
		
	
		
			
			| 
				2484
			 | 
			
				2493
			 | 
			
			
				   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then 
			 | 
		
	
		
			
			| 
				2485
			 | 
			
				2494
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				2486
			 | 
			
				2495
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2487
			 | 
			
				
			 | 
			
			
				-  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2496
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				2488
			 | 
			
				2497
			 | 
			
			
				       return 
			 | 
		
	
		
			
			| 
				2489
			 | 
			
				2498
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				2490
			 | 
			
				2499
			 | 
			
			
				   # if this is exclusively a writer setup 
			 |