Add a field to the postfix forwarder package to set the max message size.

4 files changed, 24 insertions, 4 deletions

diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index f100a937..cf470c8f 100644
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -35,9 +35,12 @@ function sync_package_postfix() {
 
 	$relay_domains = "";
 	$transport = "";
+	$message_size_limit = "10240000";
 
 	if (is_array($config['installedpackages']['postfix']['config'])) {
 		foreach ($config['installedpackages']['postfix']['config'] as $postfix_config) {
+			if (isset($postfix_config['message_size_limit']))
+				$message_size_limit = $postfix_config['message_size_limit'];
 			if (is_array($postfix_config['row'])) {
 				foreach ($postfix_config['row'] as $postfix_row) {
 					$relay_domains .= ' ' . $postfix_row['domain'];
@@ -53,7 +56,8 @@ function sync_package_postfix() {
 		"transport_maps = hash:/usr/local/etc/postfix/transport\n" .
 		"local_recipient_maps =\n" .
 		"mydestination =\n" .
-		"mynetworks_style = host\n";
+		"mynetworks_style = host\n" .
+		"message_size_limit = {$message_size_limit}\n";
 
 	conf_mount_rw();
 
diff --git a/config/postfix/postfix.xml b/config/postfix/postfix.xml
index e1e89bae..292ca595 100644
--- a/config/postfix/postfix.xml
+++ b/config/postfix/postfix.xml
@@ -42,7 +42,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>postfix</name>
-	<version>1.0</version>
+	<version>1.1</version>
 	<title>Services: Postfix Forwarder</title>
 	<include_file>/usr/local/pkg/postfix.inc</include_file>
 	<menu>
@@ -63,6 +63,22 @@
 	</additional_files_needed>
 	<fields>
 		<field>
+			<name>Posftix General Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Maximum message size</fielddescr>
+			<fieldname>message_size_limit</fieldname>
+			<type>input</type>
+			<description>
+				This setting governs the largest message size that will be accepted by this mail server. Ensure you have enough space to accommodate this size, and ensure this setting matches or is lower than the destination server(s).&lt;br/&gt;Default: 10240000 (10MB).
+			</description>
+		</field>
+		<field>
+			<name>Domains to Forward</name>
+			<type>listtopic</type>
+		</field>
+		<field>
 			<fielddescr>Forwarding</fielddescr>
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 2ba7c92a..8cfbcfbb 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -334,7 +334,7 @@
 		<config_file>http://www.pfsense.com/packages/config/postfix/postfix.xml</config_file>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>postfix-2.7.2,1.tbz</depends_on_package>
-		<version>2.7.2,1</version>
+		<version>2.7.2,1_1.1</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>postfix.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index adbe3c46..54654373 100755
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -384,7 +384,7 @@
 		<config_file>http://www.pfsense.com/packages/config/postfix/postfix.xml</config_file>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>postfix-2.7.2,1.tbz</depends_on_package>
-		<version>2.7.2,1</version>
+		<version>2.7.2,1_1.1</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>postfix.xml</configurationfile>