feat: remove rspamd

roles/postfix/defaults/main/global.yml

@@ -23,7 +23,6 @@ postfix_policyd_spf_enable: no
 postfix_srsd_enable: no
 postfix_srsd_nodefault: no
 postfix_spamassassin_enable: no
-postfix_rspamd_enable: no
 postfix_easywks_pipe_transport: no
 postfix_opendkim_enable: no
 postfix_srsd_forward_lookup: "tcp:localhost:10001"

roles/postfix/defaults/main/restrictions.yml

@@ -41,7 +41,6 @@ postfix_smtpd_client_restrictions:
 postfix_non_smtpd_milters: []
 postfix_smtpd_milters: []
 postfix_spamassassin_milter: "unix:/spamass/spamass.sock"
-postfix_rspamd_milter: "inet:localhost:11332"
 postfix_opendkim_milter: "unix:/opendkim/opendkim.sock"
 
 postfix_header_checks: []

roles/postfix/templates/etc/postfix/main.cf.j2

@@ -134,9 +134,6 @@ smtpd_milters =
 {% if postfix_spamassassin_enable %}
 	{{ postfix_spamassassin_milter }},
 {% endif %}
-{% if postfix_rspamd_enable %}
-	{{ postfix_rspamd_milter }},
-{% endif %}
 {% if postfix_opendkim_enable %}
 	{{ postfix_opendkim_milter }},
 {% endif %}

roles/rspamd/defaults/main.yml

@@ -1,8 +0,0 @@
----
-
-rspamd_redis_servers: [localhost]
-rspamd_redis_servers_write: "{{ rspamd_redis_servers }}"
-
-rspamd_controller_password: "q1"
-
-rspamd_greylist_enable: true

roles/rspamd/handlers/main.yml

@@ -1,6 +0,0 @@
----
-
-- name: reload rspamd
-  ansible.builtin.service:
-    name: rspamd
-    state: reloaded

roles/rspamd/tasks/config.yml

@@ -1,26 +0,0 @@
----
-
-- name: Render rspamd configuration
-  ansible.builtin.template:
-    src: etc/rspamd/local.d/{{ item }}.j2
-    dest: /etc/rspamd/local.d/{{ item }}
-    owner: root
-    group: root
-    mode: "0644"
-  loop:
-    - worker-controller.inc
-    - redis.conf
-    - greylist.conf
-  notify: reload rspamd
-
-- name: Start and enable redis-server
-  ansible.builtin.service:
-    name: redis
-    state: started
-    enabled: true
-
-- name: Start and enable rspamd
-  ansible.builtin.service:
-    name: rspamd
-    state: started
-    enabled: true

roles/rspamd/tasks/install.yml

@@ -1,7 +0,0 @@
----
-
-- name: Install rspamd
-  ansible.builtin.apt:
-    name:
-      - rspamd
-      - redis-server

roles/rspamd/tasks/main.yml

@@ -1,13 +0,0 @@
----
-
-- name: Install rspamd
-  ansible.builtin.import_tasks: install.yml
-  tags:
-    - "role::rspamd"
-    - "role::rspamd:install"
-
-- name: Configure rspamd
-  ansible.builtin.import_tasks: config.yml
-  tags:
-    - "role::rspamd"
-    - "role::rspamd:config"

roles/rspamd/templates/etc/rspamd/local.d/greylist.conf.j2

@@ -1,3 +0,0 @@
-{{ ansible_managed | comment }}
-
-enable = {{ rspamd_greylist_enable | ternary('true', 'false') }};

roles/rspamd/templates/etc/rspamd/local.d/redis.conf.j2

@@ -1,4 +0,0 @@
-{{ ansible_managed | comment }}
-
-read_servers = "{{ rspamd_redis_servers | join(',') }}";
-write_servers = "{{ rspamd_redis_servers_write | join(',') }}";

roles/rspamd/templates/etc/rspamd/local.d/worker-controller.inc.j2

@@ -1,3 +0,0 @@
-{{ ansible_managed | comment }}
-
-password = "{{ rspamd_controller_password }}";