free/freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep emails to the root user in a different folder

Browse Source
This commit is contained in:
Bob Mottram 2016-03-10 09:51:23 +00:00
parent dddb128e0a
commit afa8244dd1
1 changed files with 315 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/freedombone
View File

@ -4932,6 +4932,10 @@ function create_procmail {
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.procmailrc chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.procmailrc
fi fi
mkdir -p /home/$MY_USERNAME/Maildir/admin/new
mkdir -p /home/$MY_USERNAME/Maildir/admin/cur
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir/admin
if [ ! -f /etc/skel/.procmailrc ]; then if [ ! -f /etc/skel/.procmailrc ]; then
cp /home/$MY_USERNAME/.procmailrc /etc/skel/.procmailrc cp /home/$MY_USERNAME/.procmailrc /etc/skel/.procmailrc
chown root:root /etc/skel/.procmailrc chown root:root /etc/skel/.procmailrc
@ -4940,6 +4944,15 @@ function create_procmail {
echo 'create_procmail' >> $COMPLETION_FILE echo 'create_procmail' >> $COMPLETION_FILE
} }
function handle_admin_emails {
# keep emails for root in a separate folder
if [ -d /home/$MY_USERNAME/Maildir/admin ]; then
return
fi
freedombone-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no
}
function spam_filtering { function spam_filtering {
if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
return return
@ -5977,9 +5990,9 @@ function create_public_mailing_list {
${PROJECT_NAME}-addlist -u $MY_USERNAME -l "$PUBLIC_MAILING_LIST" -s "$PUBLIC_MAILING_LIST" ${PROJECT_NAME}-addlist -u $MY_USERNAME -l "$PUBLIC_MAILING_LIST" -s "$PUBLIC_MAILING_LIST"
echo 'create_public_mailing_list' >> $COMPLETION_FILE echo 'create_public_mailing_list' >> $COMPLETION_FILE
} }
function create_private_mailing_list { function create_private_mailing_list {
if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
return return
fi fi
@ -6037,9 +6050,9 @@ function create_private_mailing_list {
usermod -a -G mail schleuder usermod -a -G mail schleuder
#exim -d -bt $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME #exim -d -bt $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME
echo 'create_private_mailing_list' >> $COMPLETION_FILE echo 'create_private_mailing_list' >> $COMPLETION_FILE
} }
function split_gpg_key_into_fragments { function split_gpg_key_into_fragments {
# split the gpg key into fragments if social key management is enabled # split the gpg key into fragments if social key management is enabled
if [[ $ENABLE_SOCIAL_KEY_MANAGEMENT == "yes" ]]; then if [[ $ENABLE_SOCIAL_KEY_MANAGEMENT == "yes" ]]; then
echo 'Splitting GPG key. You may need to enter your passphrase.' echo 'Splitting GPG key. You may need to enter your passphrase.'
@ -6049,9 +6062,9 @@ function split_gpg_key_into_fragments {
exit 86548 exit 86548
fi fi
fi fi
} }
function import_email { function import_email {
if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
return return
fi fi
@ -6105,9 +6118,9 @@ function import_email {
fi fi
exit 0 exit 0
fi fi
} }
function install_web_server { function install_web_server {
if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
return return
fi fi
@ -10700,6 +10713,7 @@ mesh_babel
route_outgoing_traffic_through_tor route_outgoing_traffic_through_tor
configure_email configure_email
create_procmail create_procmail
handle_admin_emails
spam_filtering spam_filtering
configure_imap configure_imap
#configure_imap_client_certs #configure_imap_client_certs