From 788f449efd16c7e11a3a9e82ede43e1aa0f45b4b Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 30 Sep 2018 09:22:04 +0200
Subject: [PATCH] mail/postfix: add portfield to postfix (#879)

---
 mail/postfix/Makefile                                       | 2 +-
 .../mvc/app/controllers/OPNsense/Postfix/forms/general.xml  | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/Postfix/General.xml    | 6 +++++-
 .../opnsense/service/templates/OPNsense/Postfix/master.cf   | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4e6f6cb1c..c7ecb1f60 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		postfix
-PLUGIN_VERSION=		1.5
+PLUGIN_VERSION=		1.6
 PLUGIN_COMMENT=		SMTP mail relay
 PLUGIN_DEPENDS=		postfix-sasl
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
index b7aecbb3c..4d6ea164e 100644
--- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
+++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
@@ -29,6 +29,12 @@
         <type>text</type>
         <help>The 'Listen IPs' parameter specifies the IP address to listen to. Default is to listen on all interfaces.</help>
     </field>
+    <field>
+        <id>general.inet_port</id>
+        <label>Listen Port</label>
+        <type>text</type>
+        <help>Port to listen on.</help>
+    </field>
     <field>
         <id>general.bind_address</id>
         <label>Bind SMTP Client Address</label>
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
index 1a8a36f30..c19f4ec2f 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/postfix/general</mount>
     <description>Postfix configuration</description>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -23,6 +23,10 @@
             <default>all</default>
             <Required>Y</Required>
         </inet_interfaces>
+        <inet_port type="PortField">
+            <default>25</default>
+            <Required>Y</Required>
+        </inet_port>
         <bind_address type="NetworkField">
             <Required>N</Required>
             <AddressFamily>ipv4</AddressFamily>
diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf
index 4fb709e7f..d41a3c3e7 100644
--- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf
+++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf
@@ -10,7 +10,7 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (no)    (never) (100)
 # ==========================================================================
-smtp      inet  n       -       n       -       -       smtpd
+{{ OPNsense.postfix.general.inet_port }}      inet  n       -       n       -       -       smtpd
 #smtp      inet  n       -       n       -       1       postscreen
 #smtpd     pass  -       -       n       -       -       smtpd
 #dnsblog   unix  -       -       n       -       0       dnsblog