From e02c51b1d1ea9eda3d2d32767a94414a22b4d97d Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 29 Nov 2018 21:51:09 +0100
Subject: [PATCH] [Rspamd] Fix examples for global white/blacklist

---
 .../rspamd/custom/global_from_blacklist.map   |  2 +-
 .../rspamd/custom/global_from_whitelist.map   |  2 +-
 .../rspamd/custom/global_rcpt_blacklist.map   |  2 +-
 .../rspamd/custom/global_rcpt_whitelist.map   |  2 +-
 data/conf/sogo/plist_ldap                     | 28 +++++++++++++++++++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 data/conf/sogo/plist_ldap

diff --git a/data/conf/rspamd/custom/global_from_blacklist.map b/data/conf/rspamd/custom/global_from_blacklist.map
index 926c6b32..3c872889 100644
--- a/data/conf/rspamd/custom/global_from_blacklist.map
+++ b/data/conf/rspamd/custom/global_from_blacklist.map
@@ -1 +1 @@
-# /.*@example.com/i
+# /.+example\.com/i
diff --git a/data/conf/rspamd/custom/global_from_whitelist.map b/data/conf/rspamd/custom/global_from_whitelist.map
index 926c6b32..3c872889 100644
--- a/data/conf/rspamd/custom/global_from_whitelist.map
+++ b/data/conf/rspamd/custom/global_from_whitelist.map
@@ -1 +1 @@
-# /.*@example.com/i
+# /.+example\.com/i
diff --git a/data/conf/rspamd/custom/global_rcpt_blacklist.map b/data/conf/rspamd/custom/global_rcpt_blacklist.map
index 926c6b32..3c872889 100644
--- a/data/conf/rspamd/custom/global_rcpt_blacklist.map
+++ b/data/conf/rspamd/custom/global_rcpt_blacklist.map
@@ -1 +1 @@
-# /.*@example.com/i
+# /.+example\.com/i
diff --git a/data/conf/rspamd/custom/global_rcpt_whitelist.map b/data/conf/rspamd/custom/global_rcpt_whitelist.map
index 926c6b32..3c872889 100644
--- a/data/conf/rspamd/custom/global_rcpt_whitelist.map
+++ b/data/conf/rspamd/custom/global_rcpt_whitelist.map
@@ -1 +1 @@
-# /.*@example.com/i
+# /.+example\.com/i
diff --git a/data/conf/sogo/plist_ldap b/data/conf/sogo/plist_ldap
new file mode 100644
index 00000000..d585a494
--- /dev/null
+++ b/data/conf/sogo/plist_ldap
@@ -0,0 +1,28 @@
+                <!--
+                <example>
+                    <key>canAuthenticate</key>
+                    <string>YES</string>
+                    <key>id</key>
+                    <string>${line}_ldap</string>
+                    <key>isAddressBook</key>
+                    <string>NO</string>
+                    <key>IDFieldName</key>
+                    <string>mail</string>
+                    <key>UIDFieldName</key>
+                    <string>uid</string>
+                    <key>bindFields</key>
+                    <array>
+                        <string>mail</string>
+                    </array>
+                    <key>type</key>
+                    <string>ldap</string>
+                    <key>bindDN</key>
+                    <string>cn=admin,dc=example,dc=local</string>
+                    <key>bindPassword</key>
+                    <string>password</string>
+                    <key>baseDN</key>
+                    <string>ou=People,dc=example,dc=local</string>
+                    <key>hostname</key>
+                    <string>ldap://1.2.3.4:389</string>
+                </example>
+                -->