postfix - package version 2.3

1 files changed, 49 insertions, 52 deletions

diff --git a/config/postfix/postfix_sync.xml b/config/postfix/postfix_sync.xml
index afceaf9a..08a62d87 100644
--- a/config/postfix/postfix_sync.xml
+++ b/config/postfix/postfix_sync.xml
@@ -51,107 +51,104 @@
 		<section>Services</section>
 		<url>pkg_edit.php?xml=postfix.xml&amp;id=0</url>
 	</menu>
-	<service>
-		<name>postfix</name>
-		<rcfile>postfix.sh</rcfile>
-		<executable>master</executable>
-	</service>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix.inc</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_acl.xml</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_recipients.xml</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_antispam.xml</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-
-		<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_sync.xml</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-		<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_view_config.php</item>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_recipients.php</item>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
 <tabs>
 		<tab>
 			<text>General</text>
 			<url>/pkg_edit.php?xml=postfix.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>ACLs / Filter Maps</text>
-			<url>/pkg_edit.php?xml=postfix_acl.xml&amp;id=0</url>
+			<text>Domains</text>
+			<url>/pkg_edit.php?xml=postfix_domains.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Valid recipients</text>
+			<text>Recipients</text>
 			<url>/pkg_edit.php?xml=postfix_recipients.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Access Lists</text>
+			<url>/pkg_edit.php?xml=postfix_acl.xml&amp;id=0</url>
+		</tab>
+		<tab>
 			<text>Antispam</text>
 			<url>/pkg_edit.php?xml=postfix_antispam.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>XMLRPC Sync</text>
+			<text>Sync</text>
 			<url>/pkg_edit.php?xml=postfix_sync.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>View config files</text>
+			<text>View config</text>
 			<url>/postfix_view_config.php</url>
 		</tab>
 		<tab>
-			<text>Search Email</text>
+			<text>Search mail</text>
+			<url>/postfix_search.php</url>
+		</tab>
+		<tab>
+			<text>Queue</text>
+			<url>/postfix_queue.php</url>
+		</tab>
+		<tab>
+			<text>About</text>
 			<url>/postfix_search.php</url>
 		</tab>
 </tabs>
 	<fields>
 		<field>
-			<name>Postfix XMLRPC Sync</name>
+			<name>Postfix Sync</name>
 			<type>listtopic</type>
 		</field>
 		<field>
 			<fielddescr>Automatically sync Postfix configuration changes</fielddescr>
 			<fieldname>synconchanges</fieldname>
-			<description>pfSense will automatically sync changes to the hosts defined below.</description>
+			<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>
 		</field>
 		<field>
-			<fielddescr>Remote Server</fielddescr>
+			<fielddescr><![CDATA[Remote Server]]></fielddescr>
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
 			<rowhelper>
 			<rowhelperfield>
+			<fielddescr>Sync Type  </fielddescr>
+			<fieldname>sync_type</fieldname>
+			<type>select</type>
+			<options>
+				<option><name>XMLRPC Sync</name><value>xmlrpc</value></option>
+				<option><name>Share Database To</name><value>share</value></option>
+				<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>
 				<fieldname>ipaddress</fieldname>
 				<description>IP Address of remote server</description>
 				<type>input</type>
-				<size>20</size>
+				<size>10</size>
 			</rowhelperfield>
 			<rowhelperfield>
 				<fielddescr>Password</fielddescr>
 				<fieldname>password</fieldname>
 				<description>Password for remote server.</description>
 				<type>password</type>
-				<size>20</size>
+				<size>10</size>
+			</rowhelperfield>
+			<rowhelperfield>
+				<fielddescr>Description</fielddescr>
+				<fieldname>description</fieldname>
+				<type>input</type>
+				<size>25</size>
 			</rowhelperfield>
 			</rowhelper>
 		</field>