chore(email): changes in configuration

roles/email/defaults/main.yml

@@ -68,12 +68,14 @@ rspamd_docker_conf_path: "/etc/rspamd"
 rspamd_docker_static_runtime_data_path: "/var/lib/rspamd" #*.hs, *.hsmp, *.map files in here get recreated every start and do not have to be backed up
 rspamd_docker_image: registry.gitlab.com/famedly/containers/email/rspamd
 rspamd_docker_name: rspamd
-rspamd_docker_ports: []
+rspamd_docker_ports:
+  - "{{ rspamd_milter_listening_port }}:{{ rspamd_milter_listening_port }}"
 rspamd_docker_labels: {}
 dkim_selector_name: ratzupaltuff-test #hostname or month/year
 dkim_cert_filename: "{{ dkim_selector_name }}.key.pem"
 #rspamd_listening_address: "{{ email_network_prefix }}.1" #v4 for any v4 interface
-rspamd_listening_address: "172.3.0.5" #v4 for any v4 interface
+#rspamd_listening_address: "172.3.0.5" #v4 for any v4 interface
 rspamd_milter_listening_port: "11332"
+rspamd_listening_address: "0.0.0.0" #v4 for any v4 interface
 rspamd_docker_volumes:
-  - "{{ rspamd_host_base_path }}/static_runtime_data/:{{ rspamd_docker_static_runtime_data_path }}:rw"
+  - "{{ rspamd_host_base_path }}/static_runtime_data/:{{ rspamd_docker_static_runtime_data_path }}:rw"

roles/email/templates/rspamd/configdir/local.d/worker-controller.inc

@@ -0,0 +1 @@
+#bind_socket = "*:11334";

roles/email/templates/rspamd/configdir/local.d/worker-normal.inc

@@ -1,6 +1,6 @@
 # /etc/rspamd/local.d/worker-normal.inc
-#bind_socket = "*:{{ rspamd_listening_port }}";
-bind_socket = "*:11333";
+#bind_socket = "*:{{ rspamd_milter_listening_port }}";
+#bind_socket = "*:11333";
 #count = 1;
 #enabled = true; #default
-#enabled = false; #not needed in proxy selfscan mode
+enabled = false; #not needed in proxy selfscan mode

roles/email/templates/rspamd/configdir/local.d/worker-proxy.inc

@@ -14,5 +14,6 @@ spam_header = "X-Spam"; # Use the specific spam header
 reject_message = "Spam message rejected"; # Use custom rejection message
 
 bind_socket = "*:{{ rspamd_milter_listening_port }}";
+#bind_socket = "{{ email_local_send_network }}:{{ rspamd_milter_listening_port }}";
 #count = 1;
-#enabled = true; #default
+#enabled = true; #default

roles/email/templates/rspamd/worker-proxy.conf

@@ -0,0 +1,6 @@
+worker "rspamd_proxy" {
+    bind_socket = "localhost:11332";
+    .include "$CONFDIR/worker-proxy.inc"
+    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc"
+}

roles/email/templates/rspamd/worker-proxy.inc

@@ -0,0 +1,30 @@
+# Proxy worker setup
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify 'local.d/worker-proxy.inc' to add and merge
+# parameters defined inside this section
+#
+# You can modify 'override.d/worker-proxy.inc' to strictly override all
+# parameters defined inside this section
+#
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
+# Module documentation: https://rspamd.com/doc/workers/rspamd_proxy.html
+
+milter = yes; # Enable milter mode
+timeout = 120s; # Needed for Milter usually
+
+upstream "local" {
+  default = yes;
+  hosts = "localhost";
+}
+
+count = 1; # Do not spawn too many processes of this type
+max_retries = 5; # How many times master is queried in case of failure
+discard_on_reject = false; # Discard message instead of rejection
+quarantine_on_reject = false; # Tell MTA to quarantine rejected messages
+spam_header = "X-Spam"; # Use the specific spam header
+reject_message = "Spam message rejected"; # Use custom rejection message
+
+

roles/email/tests/openrelaycheck.yml

@@ -3,9 +3,9 @@
   telnet:
     host: "{{ postfix_hostname }}"
     command:
-      - "HELO {{ postfix_hostname }}"
-      - "MAIL FROM: test@{{ email_domain }}"
-      - "RCPT TO: v.wilke@famedly.de"
+      - "HELO {{ postfix_hostname }}" #HELO mail.ratzupaltuff-test.famedly.de
+      - "MAIL FROM: test@{{ email_domain }}" #MAIL FROM: test@ratzupaltuff-test.famedly.de
+      - "RCPT TO: v.wilke@famedly.de" #RCPT TO: test-ji0oovxy9@srv1.mail-tester.com
       - "DATA" #not tested this file has to be reviewed!
       - "."
-      - "QUIT"
+      - "QUIT"