diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf index 1d05571e..6792eb34 100644 --- a/data/conf/dovecot/dovecot.conf +++ b/data/conf/dovecot/dovecot.conf @@ -10,9 +10,9 @@ disable_plaintext_auth = yes login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c %k" mail_home = /var/vmail/%d/%n mail_location = maildir:~/ -mail_plugins = quota acl zlib antispam +mail_plugins = quota acl zlib mail_crypt auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ -ssl_protocols = !SSLv3 !SSLv2 +#ssl_protocols = !SSLv3 !SSLv2 ssl_prefer_server_ciphers = yes ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA ssl_options = no_compression @@ -24,12 +24,12 @@ auth_master_user_separator = * mail_prefetch_count = 30 passdb { driver = passwd-file - args = /etc/dovecot/dovecot-master.passwd + args = /usr/local/etc/dovecot/dovecot-master.passwd master = yes pass = yes } passdb { - args = /etc/dovecot/sql/dovecot-mysql.conf + args = /usr/local/etc/dovecot/sql/dovecot-mysql.conf driver = sql } namespace inbox { @@ -202,15 +202,15 @@ listen = *,[::] ssl_cert = </etc/ssl/mail/cert.pem ssl_key = </etc/ssl/mail/key.pem userdb { - args = /etc/dovecot/sql/dovecot-mysql.conf + args = /usr/local/etc/dovecot/sql/dovecot-mysql.conf driver = sql } protocol imap { - mail_plugins = quota imap_quota imap_acl acl zlib imap_zlib antispam + mail_plugins = quota imap_quota imap_acl acl zlib imap_zlib imap_sieve mail_crypt } protocol lmtp { - mail_plugins = quota sieve acl zlib - auth_socket_path = /var/run/dovecot/auth-master + mail_plugins = quota sieve acl zlib mail_crypt + auth_socket_path = /usr/local/var/run/dovecot/auth-master } protocol sieve { managesieve_logout_format = bytes=%i/%o @@ -221,22 +221,31 @@ plugin { acl = vfile quota = dict:Userquota::proxy::sqlquota quota_rule2 = Trash:storage=+100%% - antispam_backend = mailtrain - antispam_spam = Junk - antispam_trash = Trash - antispam_mail_sendmail = /usr/local/bin/rspamd-pipe - antispam_mail_spam = learn_spam - antispam_mail_notspam = learn_ham - # Do not complain about empty parameter - antispam_mail_sendmail_args = --blind sieve = /var/vmail/sieve/%u.sieve + sieve_plugins = sieve_imapsieve sieve_extprograms + # From elsewhere to Spam folder + imapsieve_mailbox1_name = Junk + imapsieve_mailbox1_causes = COPY + imapsieve_mailbox1_before = file:/usr/local/lib/dovecot/sieve/report-spam.sieve + # END + # From Spam folder to elsewhere + imapsieve_mailbox2_name = * + imapsieve_mailbox2_from = Junk + imapsieve_mailbox2_causes = COPY + imapsieve_mailbox2_before = file:/usr/local/lib/dovecot/sieve/report-ham.sieve + # END + sieve_pipe_bin_dir = /usr/local/lib/dovecot/sieve + sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.execute sieve_after = /var/vmail/sieve/global.sieve sieve_max_script_size = 1M sieve_quota_max_scripts = 0 sieve_quota_max_storage = 0 + mail_crypt_global_private_key = </mail_crypt/ecprivkey.pem + mail_crypt_global_public_key = </mail_crypt/ecpubkey.pem + mail_crypt_save_version = 2 } dict { - sqlquota = mysql:/etc/dovecot/sql/dovecot-dict-sql.conf + sqlquota = mysql:/usr/local/etc/dovecot/sql/dovecot-dict-sql.conf } remote 127.0.0.1 { disable_plaintext_auth = no