Mods to sync_xml file

Changes as per the previous commit for XMLRPC sync.

1 files changed, 75 insertions, 23 deletions

diff --git a/config/pfblockerng/pfblockerng_sync.xml b/config/pfblockerng/pfblockerng_sync.xml
index c5777dcf..34a6ba56 100644
--- a/config/pfblockerng/pfblockerng_sync.xml
+++ b/config/pfblockerng/pfblockerng_sync.xml
@@ -123,7 +123,7 @@
 		</tabs>
 	<fields>
 		<field>
-			<name>pfBlockerNG XMLRPC Sync</name>
+			<name>pfBlockerNG XMLRPC Sync Settings</name>
 			<type>listtopic</type>
 		</field>
 		<field>
@@ -134,35 +134,87 @@
 			<type>info</type>
 		</field>
 		<field>
-			<fielddescr>Automatically sync pfBlockerNG configuration changes</fielddescr>
-			<fieldname>synconchanges</fieldname>
-			<description>Automatically sync changes to the hosts defined below.</description>
+			<fielddescr>Enable Sync</fielddescr>
+			<fieldname>varsynconchanges</fieldname>
+			<description><![CDATA[When enabled, this will sync all configuration settings to the Replication Targets.<br /><br />
+				<b>Important:</b> While using "Sync to hosts defined below", only sync from host A to B, A to C
+				<br /> but <b>do not</B> enable XMLRPC sync <b>to</b> A. This will result in a loop!]]>
+			</description>
+			<type>select</type>
+			<required/>
+			<default_value>disabled</default_value>
+			<options>
+				<option><name>Do not sync this package configuration</name><value>disabled</value></option>
+				<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>
+			</options>
+		</field>
+		<field>
+			<fielddescr>XMLRPC Timeout</fielddescr>
+			<fieldname>varsynctimeout</fieldname>
+			<description><![CDATA[Timeout in seconds for the XMLRPC timeout. Default: 150]]></description>
+			<type>input</type>
+			<default_value>150</default_value>
+			<size>5</size>
+		</field>
+		<field>
+			<fielddescr><![CDATA[Disable 'General Tab' sync]]></fielddescr>
+			<fieldname>syncinterfaces</fieldname>
+			<description>When selected, the 'General' Tab Customizations will not be sync'd</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Remote Server</fielddescr>
+			<name>pfBlockerNG XMLRPC Replication Targets</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Replication Targets</fielddescr>
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
 			<rowhelper>
-			<rowhelperfield>
-				<fielddescr>IP Address</fielddescr>
-				<fieldname>ipaddress</fieldname>
-				<description>IP Address of remote server</description>
-				<type>input</type>
-				<size>20</size>
-			</rowhelperfield>
-			<rowhelperfield>
-				<fielddescr>Password</fielddescr>
-				<fieldname>password</fieldname>
-				<description>Password for remote server.</description>
-				<type>password</type>
-				<size>20</size>
-			</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Enable</fielddescr>
+					<fieldname>varsyncdestinenable</fieldname>
+					<description><![CDATA[Enable this host as a replication target]]></description>
+					<type>checkbox</type>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Protocol</fielddescr>
+					<fieldname>varsyncprotocol</fieldname>
+					<description><![CDATA[Choose the protocol of the destination host. Probably <b>http</b> or <b>https</b>]]></description>
+					<type>select</type>
+					<default_value>HTTP</default_value>
+					<options>
+						<option><name>HTTP</name><value>http</value></option>
+						<option><name>HTTPS</name><value>https</value></option>
+					</options>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>IP-Address</fielddescr>
+					<fieldname>varsyncipaddress</fieldname>
+					<description><![CDATA[IP Address of the destination host.]]></description>
+					<type>input</type>
+					<size>15</size>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Port</fielddescr>
+					<fieldname>varsyncport</fieldname>
+					<description><![CDATA[Choose the sync port of the destination host.]]></description>
+					<type>input</type>
+					<size>3</size>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Admin Password</fielddescr>
+					<fieldname>varsyncpassword</fieldname>
+					<description><![CDATA[Password of the user "admin" on the destination host.]]></description>
+					<type>password</type>
+					<size>20</size>
+				</rowhelperfield>
 			</rowhelper>
 		</field>
 		<field>
 			<name><![CDATA[<ul>Click to SAVE Settings and/or Rule Edits. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Changes are Applied via CRON or
-			'Force Update'</ul>]]> </name>
+			'Force Update'</ul>]]></name>
 			<type>listtopic</type>
 		</field>
 	</fields>
@@ -176,8 +228,8 @@
 		pfblockerng_validate_input($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
-		global $pfb;
-		$pfb['save'] = TRUE;
-		sync_package_pfblockerng();
+		require_once("/usr/local/pkg/pfblockerng/pfblockerng.inc");
+		write_config("[pfBlockerNG] XMLRPC sync configurations saved.");
+		pfblockerng_sync_on_changes();
 	</custom_php_resync_config_command>
 </packagegui>
\ No newline at end of file