From 61455f6e6a824668c3ebcd86b20f3043db91efce Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Sat, 23 Jan 2021 00:46:39 +0100
Subject: [PATCH] add wite and blacklist files

---
 defaults/main.yml        |  6 ++++++
 files/blacklist_from.map |  0
 files/blacklist_ip.map   |  0
 files/whitelist_from.map |  0
 files/whitelist_ip.map   |  0
 tasks/configure.yml      | 28 ++++++++++++++++++++++++++++
 vars/main.yml            |  2 +-
 7 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 files/blacklist_from.map
 create mode 100644 files/blacklist_ip.map
 create mode 100644 files/whitelist_from.map
 create mode 100644 files/whitelist_ip.map

diff --git a/defaults/main.yml b/defaults/main.yml
index 5b2de78..3fc66f3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,4 +6,10 @@ submodules_versioncheck: false
 rspamd__config_path: '/etc/rspamd/local.d/'
 rspamd__admin_password: 'ChangeMePl3ase'
 rspamd__redis_server: '127.0.0.1'
+
+# rspamd config file path
 rspamd__multimap_conf_file: 'files/multimap.conf'
+rspamd__whitelist_ip_file: 'files/whitelist_ip.map'
+rspamd__whitelist_from_file: 'files/whitelist_from.map'
+rspamd__blacklist_ip_file: 'files/blacklist_ip.map'
+rspamd__blacklist_from_file: 'files/blacklist_from.map'
diff --git a/files/blacklist_from.map b/files/blacklist_from.map
new file mode 100644
index 0000000..e69de29
diff --git a/files/blacklist_ip.map b/files/blacklist_ip.map
new file mode 100644
index 0000000..e69de29
diff --git a/files/whitelist_from.map b/files/whitelist_from.map
new file mode 100644
index 0000000..e69de29
diff --git a/files/whitelist_ip.map b/files/whitelist_ip.map
new file mode 100644
index 0000000..e69de29
diff --git a/tasks/configure.yml b/tasks/configure.yml
index c4e1896..aba213c 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -47,3 +47,31 @@
     src: "{{ rspamd__multimap_conf_file }}"
     dest: "{{ rspamd__config_path }}multimap.conf"
     mode: '0640'
+
+- name: multimap whitelist_ip.map
+  become: true
+  ansible.builtin.copy:
+    src: "{{ rspamd__whitelist_ip_file }}"
+    dest: "{{ rspamd__config_path }}whitelist_ip.map"
+    mode: '0640'
+
+- name: multimap whitelist_from.map
+  become: true
+  ansible.builtin.copy:
+    src: "{{ rspamd__whitelist_from_file }}"
+    dest: "{{ rspamd__config_path }}whitelist_from.map"
+    mode: '0640'
+
+- name: multimap blacklist_ip.map
+  become: true
+  ansible.builtin.copy:
+    src: "{{ rspamd__blacklist_ip_file }}"
+    dest: "{{ rspamd__config_path }}blacklist_ip.map"
+    mode: '0640'
+
+- name: multimap blacklist_from.map
+  become: true
+  ansible.builtin.copy:
+    src: "{{ rspamd__blacklist_from_file }}"
+    dest: "{{ rspamd__config_path }}blacklist_from.map"
+    mode: '0640'
diff --git a/vars/main.yml b/vars/main.yml
index b450c63..301722c 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,6 @@
 ---
 # versionscheck
-playbook_version_number: 3   # should be a integer
+playbook_version_number: 4   # should be a integer
 playbook_version_path: 'do1jlr.rspamd.version'
 
 _rspamd__admin_password: "{{ rspamd__admin_password | password_hash('bcrypt') }}"