From 9620b6f76e3a9a22df3d17c4ad9f2b77c7db2416 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 1 Dec 2019 15:56:35 +0100
Subject: [PATCH] mail/postfix: add milter protocol selection (#1600)

---
 mail/postfix/Makefile                                  |  2 +-
 mail/postfix/pkg-descr                                 |  5 +++++
 .../controllers/OPNsense/Postfix/forms/antispam.xml    |  6 ++++++
 .../mvc/app/models/OPNsense/Postfix/Antispam.xml       | 10 +++++++++-
 .../service/templates/OPNsense/Postfix/main.cf         |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 2b79564cb..ca8860ddb 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		postfix
-PLUGIN_VERSION=		1.12
+PLUGIN_VERSION=		1.13
 PLUGIN_COMMENT=		SMTP mail relay
 PLUGIN_DEPENDS=		postfix-sasl
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/mail/postfix/pkg-descr b/mail/postfix/pkg-descr
index b40207c69..b319d4237 100644
--- a/mail/postfix/pkg-descr
+++ b/mail/postfix/pkg-descr
@@ -6,6 +6,11 @@ is completely different.
 Plugin Changelog
 ================
 
+
+1.13
+
+* Allow setting IP version for connecting to rspamd
+
 1.12
 
 * Fix sort order to put sender acces in front of recipient access
diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml
index 9db8d64b3..56385df57 100644
--- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml
+++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml
@@ -5,4 +5,10 @@
         <type>checkbox</type>
         <help>This will allow Postfix to connect to rspamd via milter protocol.</help>
     </field>
+    <field>
+        <id>antispam.milter_rspamd</id>
+        <label>Milter IP Version</label>
+        <type>dropdown</type>
+        <help>Select the IP version for connecting to rspamd.</help>
+    </field>
 </form>
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml
index ce585fd57..6e0e02587 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml
@@ -1,11 +1,19 @@
 <model>
     <mount>//OPNsense/postfix/antispam</mount>
     <description>Postfix Antispam configuration</description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <items>
         <enable_rspamd type="BooleanField">
             <default>0</default>
             <Required>Y</Required>
         </enable_rspamd>
+        <milter_rspamd type="OptionField">
+            <default>6</default>
+            <Required>Y</Required>
+            <OptionValues>
+                <Option1 value="6">IPv6</Option1>
+                <Option2 value="4">IPv4</Option2>
+            </OptionValues>
+        </milter_rspamd>
     </items>
 </model>
diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
index b7cbb9fe1..fed2225db 100644
--- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
+++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
@@ -117,7 +117,7 @@ smtp_sasl_security_options =
 {% if helpers.exists('OPNsense.postfix.antispam.enable_rspamd') and OPNsense.postfix.antispam.enable_rspamd == '1' %}
 smtpd_milters = inet:localhost:11332
 non_smtpd_milters = inet:localhost:11332
-milter_protocol = 6
+milter_protocol = {{ OPNsense.postfix.antispam.milter_rspamd }}
 milter_mail_macros =  i {mail_addr} {client_addr} {client_name} {auth_authen}
 milter_default_action = accept
 {% endif %}