Просмотр исходного кода

[Dovecot] Unsupported examples for IMAP auth via LDAP
[Rspamd] Globel whitelist/blacklist from via multimap

andryyy 6 лет назад
Родитель
Сommit
f76c3ee7f3

+ 9 - 0
data/conf/dovecot/dovecot.conf

@@ -1,6 +1,12 @@
 # --------------------------------------------------------------------------
 # Please create a file "extra.conf" for persistent overrides to dovecot.conf
 # --------------------------------------------------------------------------
+# LDAP example:
+#passdb {
+#  args = /usr/local/etc/dovecot/ldap/passdb.conf
+#  driver = ldap
+#}
+
 auth_mechanisms = plain login
 #mail_debug = yes
 #auth_debug = yes
@@ -48,6 +54,9 @@ passdb {
 passdb {
   args = /usr/local/etc/dovecot/sql/dovecot-dict-sql-passdb.conf
   driver = sql
+  result_success = return-ok
+  result_failure = continue
+  result_internalfail = continue
 }
 # Set doveadm_password=your-secret-password in data/conf/dovecot/extra.conf (create if missing)
 service doveadm {

+ 9 - 0
data/conf/dovecot/ldap/passdb.conf

@@ -0,0 +1,9 @@
+#hosts = 1.2.3.4
+#dn = cn=admin,dc=example,dc=local
+#dnpass = password
+#ldap_version = 3
+#base = ou=People,dc=example,dc=local
+#auth_bind = no
+#pass_filter = (&(objectClass=posixAccount)(mail=%u))
+#pass_attrs = mail=user,userPassword=password
+#default_pass_scheme = SSHA

+ 1 - 0
data/conf/rspamd/custom/global_from_blacklist.map

@@ -0,0 +1 @@
+# /.*@example.com/i'

+ 1 - 0
data/conf/rspamd/custom/global_from_whitelist.map

@@ -0,0 +1 @@
+# /.*@example.com/i'

+ 16 - 0
data/conf/rspamd/local.d/multimap.conf

@@ -33,3 +33,19 @@ LOCAL_BL_ASN {
   description = "Sender's ASN is on the local blacklist";
   symbols_set = ["LOCAL_BL_ASN"];
 }
+
+GLOBAL_FROM_WL {
+  type = "from";
+  map = "$LOCAL_CONFDIR/custom/global_from_whitelist.map";
+  regexp = true;
+  prefilter = true;
+  action = "accept";
+}
+
+GLOBAL_FROM_BL {
+  type = "from";
+  map = "$LOCAL_CONFDIR/custom/global_from_blacklist.map";
+  regexp = true;
+  prefilter = true;
+  action = "reject";
+}