postfix - add support to pfsense 2.1 and include new sync gui

1 files changed, 49 insertions, 16 deletions

diff --git a/config/postfix/postfix_sync.xml b/config/postfix/postfix_sync.xml
index 08a62d87..88617fbf 100644
--- a/config/postfix/postfix_sync.xml
+++ b/config/postfix/postfix_sync.xml
@@ -9,7 +9,7 @@
 /*
     postfix_sync.xml
     part of the Postfix package for pfSense
-    Copyright (C) 2010 Marcello Coutinho
+    Copyright (C) 2011-2013 Marcello Coutinho
     All rights reserved.            
                                                                   */
 /* ========================================================================== */
@@ -20,7 +20,7 @@
      1. Redistributions of source code must retain the above copyright notice,
         this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
+     2. Redistributions in binary form MUST reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
 
@@ -100,23 +100,46 @@
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Automatically sync Postfix configuration changes</fielddescr>
+			<fielddescr>Sync method</fielddescr>
 			<fieldname>synconchanges</fieldname>
-			<description><![CDATA[pfSense will automatically sync changes to the hosts defined below.<br><br>
-								Remote server options are:<br>
-								<strong>XMLRPC Sync</strong> - Forward postfix settings to other pfsense boxes. Remote password required<br>
-								<strong>Share Database To</strong> - Allow other pfsense boxes to fetch maillog data via xml. Remote password NOT required.<br>
-								<strong>Fetch Database From</strong> - Merge logs from other pfsense boxes to this local database. Remote password required.<br>
-								<strong>Disabled</strong> - Ignore this host while sync.<br><br>
-								While sharing databases, you must setup 'Share Database To' in one box and 'Fetch Database From' on other box.]]></description>
-			<type>checkbox</type>
+			<description>Automatically sync postfix configuration changes.</description>
+			<type>select</type>
+			<required/>
+			<default_value>auto</default_value>
+			<options>
+				<option><name>Sync to configured system backup server</name><value>auto</value></option>
+				<option><name>Sync to host(s) defined below</name><value>manual</value></option>
+				<option><name>Do not sync this package configuration</name><value>disabled</value></option>
+			</options>
+		</field>
+		<field>
+			<fielddescr>Sync timeout</fielddescr>
+			<fieldname>synctimeout</fieldname>
+			<description>Select sync max wait time</description>
+			<type>select</type>
+			<required/>
+			<default_value>250</default_value>
+			<options>
+				<option><name>250 seconds(Default)</name><value>250</value></option>
+				<option><name>120 seconds</name><value>120</value></option>
+				<option><name>90 seconds</name><value>90</value></option>
+				<option><name>60 seconds</name><value>60</value></option>
+				<option><name>30 seconds</name><value>30</value></option>
+			</options>
 		</field>
 		<field>
 			<fielddescr><![CDATA[Remote Server]]></fielddescr>
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
+			<dontdisplayname/>
+			<usecolspan2/>
 			<rowhelper>
 			<rowhelperfield>
+				<fielddescr>Enable</fielddescr>
+				<fieldname>enabless</fieldname>
+				<type>checkbox</type>
+			</rowhelperfield>
+			<rowhelperfield>
 			<fielddescr>Sync Type  </fielddescr>
 			<fieldname>sync_type</fieldname>
 			<type>select</type>
@@ -126,18 +149,22 @@
 				<option><name>Fetch Database From</name><value>fetch</value></option>
 				<option><name>Disabled</name><value>disabled</value></option>
 			</options>
-			<description><![CDATA[<strong>Default: Strong</strong><br>
-								Enable sender, client, recipients and rfc verification.<br>]]></description>
 		</rowhelperfield>
-			
 			<rowhelperfield>
-				<fielddescr>IP Address</fielddescr>
+				<fielddescr>Remote Server IP</fielddescr>
 				<fieldname>ipaddress</fieldname>
 				<description>IP Address of remote server</description>
 				<type>input</type>
 				<size>10</size>
 			</rowhelperfield>
 			<rowhelperfield>
+				<fielddescr>Username</fielddescr>
+				<fieldname>username</fieldname>
+				<description>Username for remote server.</description>
+				<type>input</type>
+				<size>10</size>
+			</rowhelperfield>
+			<rowhelperfield>
 				<fielddescr>Password</fielddescr>
 				<fieldname>password</fieldname>
 				<description>Password for remote server.</description>
@@ -148,9 +175,15 @@
 				<fielddescr>Description</fielddescr>
 				<fieldname>description</fieldname>
 				<type>input</type>
-				<size>25</size>
+				<size>27</size>
 			</rowhelperfield>
 			</rowhelper>
+			<description><![CDATA[<br>Sync types Description:<br><br>
+								<strong>XMLRPC Sync</strong> - Forward postfix settings to other pfsense boxes. Remote password required<br>
+								<strong>Share Database To</strong> - Allow other pfsense boxes to fetch maillog data via xml. Remote password NOT required.<br>
+								<strong>Fetch Database From</strong> - Merge logs from other pfsense boxes to this local database. Remote password required.<br>
+								<strong>Disabled</strong> - Ignore this host while sync.<br><br>
+								While sharing databases works only when you select 'Sync to host(s) defined below' on sync method and you must setup 'Share Database To' in source box and 'Fetch Database From' on destination box.]]></description>
 		</field>
 	</fields>
 	<custom_php_install_command>