More tweaks to new Snort Pkg Sync code.

1 files changed, 39 insertions, 13 deletions

diff --git a/config/snort/snort_sync.xml b/config/snort/snort_sync.xml
index 5bfeba12..274d3fc9 100755
--- a/config/snort/snort_sync.xml
+++ b/config/snort/snort_sync.xml
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>snortsync</name>
 	<version>1.0</version>
-	<title>Proxy server snort: XMLRPC Sync</title>
+	<title>Snort: XMLRPC Sync (EXPERIMENTAL)</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<tabs>
 		<tab>
@@ -86,17 +86,17 @@ POSSIBILITY OF SUCH DAMAGE.
 	</tabs>
 	<fields>
 		<field>
-			<name>Snort XMLRPC Sync</name>
+			<name>Snort Package XMLRPC Sync Settings</name>
 			<type>listtopic</type>
 		</field>
 		<field>
 			<fielddescr>Enable Sync</fielddescr>
 			<fieldname>varsynconchanges</fieldname>
-			<description><![CDATA[All changes will be synced with apply config to the IPs listed below if this option is checked.<br>
+			<description><![CDATA[All changes will be synced with apply config to the IPs listed below if this option is checked.<br/><br/>
 						<b>Important:</b> While using "Sync to hosts defined below", only sync from host A to B, A to C 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>auto</default_value>
+			<default_value>disabled</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>
@@ -104,26 +104,42 @@ POSSIBILITY OF SUCH DAMAGE.
 			</options>
 		</field>
 		<field>
-						<fielddescr>XMLRPC timeout</fielddescr>
+			<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>
+			<default_value>150</default_value>
 			<size>5</size>
 		</field>
 
 		<field>
-			<fielddescr>Destination Server</fielddescr>
+			<fielddescr>Refresh Rule Sets</fielddescr>
+			<fieldname>vardownloadrules</fieldname>
+			<description><![CDATA[Ask target hosts to refresh rule sets files on each sync operation.<br/><br/>
+					During each Snort package sync operation, ask the target host to check for 
+					a new set of posted rule sets files and refresh the local copies if necessary.  The default is 
+					to refresh the files if newer versions have been posted.]]></description>
+			<type>select</type>
+			<default_value>yes</default_value>
+			<options>
+				<option><name>Signal target hosts to refresh rules files</name><value>yes</value></option>
+				<option><name>Do NOT ask target host to refresh rules files</name><value>no</value></option>
+			</options>
+		</field>
+
+		<field>
+			<fielddescr>Replication Targets</fielddescr>
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
 			<rowhelper>
 				<rowhelperfield>
 					<fielddescr>Enable</fielddescr>
 					<fieldname>varsyncdestinenable</fieldname>
+					<description><![CDATA[Enable this host as a replication target]]></description>
 					<type>checkbox</type>
 				</rowhelperfield>
 				<rowhelperfield>
-					<fielddescr>GUI Protocol</fielddescr>
+					<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>
@@ -134,28 +150,38 @@ POSSIBILITY OF SUCH DAMAGE.
 					</options>
 				</rowhelperfield>
 				<rowhelperfield>
-					<fielddescr>GUI IP-Address</fielddescr>
+					<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>GUI Port</fielddescr>
+					<fielddescr>Port</fielddescr>
 					<fieldname>varsyncport</fieldname>
-					<description><![CDATA[Choose the port of the destination host.]]></description>
+					<description><![CDATA[Choose the sync port of the destination host.]]></description>
 					<type>input</type>
 					<size>3</size>
 				</rowhelperfield>
-								<rowhelperfield>
-					<fielddescr>GUI Admin Password</fielddescr>
+				<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>
+				<rowhelperfield>
+					<fielddescr>Start Snort</fielddescr>
+					<fieldname>varsyncsnortstart</fieldname>
+					<description><![CDATA[Start Snort on target host if not already running.]]></description>
+					<type>checkbox</type>
+				</rowhelperfield>
 			</rowhelper>
 		</field>
+		<field>
+			<name>WARNING:  This feature is considered experimental and not recommended for production use</name>
+			<type>listtopic</type>
+		</field>
 	</fields>
 	<custom_delete_php_command>
 		write_config();snort_sync_on_changes();