Commit Diff


commit - a1a517354e3be0081243c6cc3ac1f6c24c1d695e
commit + 1bc2ad460e9c75dc2947ebb0de7c02318b6e57d9
blob - dd590263ff33ee43fd5743152d42e35c69a13c08
blob + 8d8d79faba078964954c415d7e6c9f752f3908b0
--- tasks/main.yml
+++ tasks/main.yml
@@ -50,6 +50,9 @@
 -  template: src=10-ssl.conf.j2 dest="/etc/dovecot/conf.d/10-ssl.conf" owner="root" group="wheel" mode="0644"
 -  template: src=auth-static.conf.ext.j2 dest="/etc/dovecot/conf.d/auth-static.conf.ext" owner="root" group="wheel" mode="0644"
 -  template: src=global-default.sieve.j2 dest="/var/sieve/global-default.sieve" owner="root" group="wheel" mode="0644"
+-  template: src=ip_whitelist.map.j2 dest="/etc/rspamd/local.d/ip_whitelist.map" owner="root" group="wheel" mode="0644"
+-  template: src=multimap.conf.j2 dest="/etc/rspamd/local.d/multimap.conf" owner="root" group="wheel" mode="0644"
+-  template: src=whitelist.sender.domain.map.j2 dest="/etc/rspamd/local.d/whitelist.sender.domain.map" owner="root" group="wheel" mode="0644"
 
 - blockinfile: |
       dest=/etc/login.conf backup=yes
blob - /dev/null
blob + ef5454361a5ed8060eacbc3187649a933b45d9a7 (mode 644)
--- /dev/null
+++ templates/ip_whitelist.map.j2
@@ -0,0 +1 @@
+192.43.244.163
blob - /dev/null
blob + 943edea11f9f3adb24f4776a994dc7dc87e2e8d5 (mode 644)
--- /dev/null
+++ templates/multimap.conf.j2
@@ -0,0 +1,13 @@
+WHITELIST_SENDER_DOMAIN {
+	type = "from";
+	filter = "email:domain";
+	map = "/etc/rspamd/local.d/whitelist.sender.domain.map";
+	score = -20.0
+}
+
+IP_WHITELIST {
+	type = "ip";
+	prefilter = "true";
+	map = "/etc/rspamd/local.d/ip_whitelist.map";
+	action = "accept";
+}
blob - /dev/null
blob + cbfa005448daf8f30a4269f48edfcd921a248ae2 (mode 644)
--- /dev/null
+++ templates/whitelist.sender.domain.map.j2
@@ -0,0 +1,4 @@
+paypal.com
+openbsd.org
+cvs.openbsd.org
+lists.openbsd.org