mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2024-11-22 02:17:26 +00:00
Merge pull request #528 from phareous/master
Allow global sieve scripts for before or after user sieve scripts. Th…
This commit is contained in:
commit
b2dfdc386a
@ -151,6 +151,12 @@ sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/
|
|||||||
#
|
#
|
||||||
# * `sieve_before`: The path to our global sieve which handles moving spam to the Spam folder.
|
# * `sieve_before`: The path to our global sieve which handles moving spam to the Spam folder.
|
||||||
#
|
#
|
||||||
|
# * `sieve_before2`: The path to our global sieve directory for sieve which can contain .sieve files
|
||||||
|
# to run globally for every user before their own sieve files run.
|
||||||
|
#
|
||||||
|
# * `sieve_after`: The path to our global sieve directory which can contain .sieve files
|
||||||
|
# to run globally for every user after their own sieve files run.
|
||||||
|
#
|
||||||
# * `sieve`: The path to the user's main active script. ManageSieve will create a symbolic
|
# * `sieve`: The path to the user's main active script. ManageSieve will create a symbolic
|
||||||
# link here to the actual sieve script. It should not be in the mailbox directory
|
# link here to the actual sieve script. It should not be in the mailbox directory
|
||||||
# (because then it might appear as a folder) and it should not be in the sieve_dir
|
# (because then it might appear as a folder) and it should not be in the sieve_dir
|
||||||
@ -160,6 +166,8 @@ sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/
|
|||||||
cat > /etc/dovecot/conf.d/99-local-sieve.conf << EOF;
|
cat > /etc/dovecot/conf.d/99-local-sieve.conf << EOF;
|
||||||
plugin {
|
plugin {
|
||||||
sieve_before = /etc/dovecot/sieve-spam.sieve
|
sieve_before = /etc/dovecot/sieve-spam.sieve
|
||||||
|
sieve_before2 = $STORAGE_ROOT/mail/sieve/global_before
|
||||||
|
sieve_after = $STORAGE_ROOT/mail/sieve/global_after
|
||||||
sieve = $STORAGE_ROOT/mail/sieve/%d/%n.sieve
|
sieve = $STORAGE_ROOT/mail/sieve/%d/%n.sieve
|
||||||
sieve_dir = $STORAGE_ROOT/mail/sieve/%d/%n
|
sieve_dir = $STORAGE_ROOT/mail/sieve/%d/%n
|
||||||
}
|
}
|
||||||
@ -183,6 +191,8 @@ chown -R mail.mail $STORAGE_ROOT/mail/mailboxes
|
|||||||
|
|
||||||
# Same for the sieve scripts.
|
# Same for the sieve scripts.
|
||||||
mkdir -p $STORAGE_ROOT/mail/sieve
|
mkdir -p $STORAGE_ROOT/mail/sieve
|
||||||
|
mkdir -p $STORAGE_ROOT/mail/sieve/global_before
|
||||||
|
mkdir -p $STORAGE_ROOT/mail/sieve/global_after
|
||||||
chown -R mail.mail $STORAGE_ROOT/mail/sieve
|
chown -R mail.mail $STORAGE_ROOT/mail/sieve
|
||||||
|
|
||||||
# Allow the IMAP/POP ports in the firewall.
|
# Allow the IMAP/POP ports in the firewall.
|
||||||
|
Loading…
Reference in New Issue
Block a user