| 
				
			 | 
			
			
				@@ -1160,6 +1160,22 @@ function configure_email { 
			 | 
		
	
		
			
			| 
				1160
			 | 
			
				1160
			 | 
			
			
				   echo 'configure_email' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				1161
			 | 
			
				1161
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1162
			 | 
			
				1162
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				1163
			 | 
			
			
				+function create_procmail { 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1164
			 | 
			
			
				+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1165
			 | 
			
			
				+      return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1166
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1167
			 | 
			
			
				+  if grep -Fxq "create_procmail" $COMPLETION_FILE; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1168
			 | 
			
			
				+      return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1169
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1170
			 | 
			
			
				+  if [ ! -f /home/$MY_USERNAME/.procmailrc ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1171
			 | 
			
			
				+      echo 'MAILDIR=$HOME/Maildir' > /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1172
			 | 
			
			
				+      echo 'DEFAULT=$MAILDIR/' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1173
			 | 
			
			
				+      echo 'LOGFILE=$HOME/log/procmail.log' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1174
			 | 
			
			
				+      echo 'LOGABSTRACT=all' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1175
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1176
			 | 
			
			
				+  echo 'create_procmail' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1177
			 | 
			
			
				+} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1178
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				1163
			 | 
			
				1179
			 | 
			
			
				 function spam_filtering { 
			 | 
		
	
		
			
			| 
				1164
			 | 
			
				1180
			 | 
			
			
				   # NOTE: spamassassin installation currently doesn't work, sa-compile fails with a make error 23/09/2014 
			 | 
		
	
		
			
			| 
				1165
			 | 
			
				1181
			 | 
			
			
				   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1188,10 +1204,6 @@ function spam_filtering { 
			 | 
		
	
		
			
			| 
				1188
			 | 
			
				1204
			 | 
			
			
				   echo '      spam = nobody:true' >> /etc/exim4/conf.d/acl/40_exim4-config_check_data 
			 | 
		
	
		
			
			| 
				1189
			 | 
			
				1205
			 | 
			
			
				   echo '      condition = ${if >{$spam_score_int}{120}{1}{0}}' >> /etc/exim4/conf.d/acl/40_exim4-config_check_data 
			 | 
		
	
		
			
			| 
				1190
			 | 
			
				1206
			 | 
			
			
				   # procmail configuration 
			 | 
		
	
		
			
			| 
				1191
			 | 
			
				
			 | 
			
			
				-  echo 'MAILDIR=$HOME/Maildir' > /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				1192
			 | 
			
				
			 | 
			
			
				-  echo 'DEFAULT=$MAILDIR/' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				1193
			 | 
			
				
			 | 
			
			
				-  echo 'LOGFILE=$HOME/log/procmail.log' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				1194
			 | 
			
				
			 | 
			
			
				-  echo 'LOGABSTRACT=all' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				1195
			 | 
			
				1207
			 | 
			
			
				   echo '# get spamassassin to check emails' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				1196
			 | 
			
				1208
			 | 
			
			
				   echo ':0fw: .spamassassin.lock' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
		
			
			| 
				1197
			 | 
			
				1209
			 | 
			
			
				   echo '  * < 256000' >> /home/$MY_USERNAME/.procmailrc 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -3473,6 +3485,7 @@ search_for_attached_usb_drive 
			 | 
		
	
		
			
			| 
				3473
			 | 
			
				3485
			 | 
			
			
				 regenerate_ssh_keys 
			 | 
		
	
		
			
			| 
				3474
			 | 
			
				3486
			 | 
			
			
				 script_to_make_self_signed_certificates 
			 | 
		
	
		
			
			| 
				3475
			 | 
			
				3487
			 | 
			
			
				 configure_email 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3488
			 | 
			
			
				+create_procmail 
			 | 
		
	
		
			
			| 
				3476
			 | 
			
				3489
			 | 
			
			
				 #spam_filtering 
			 | 
		
	
		
			
			| 
				3477
			 | 
			
				3490
			 | 
			
			
				 configure_imap 
			 | 
		
	
		
			
			| 
				3478
			 | 
			
				3491
			 | 
			
			
				 configure_gpg 
			 |