Add XMLRPC sync, vhost location custom settings

- Typo: Lots of typo fixes and re-indenting
- XMLRPC: Added actual code for XMLRPC (not 100% functional, remote reload fails)
- VirtualHost: Added custom settings for Locations (for SSLRequire & such)
- Settings: Use interfaces instead of manual input IP address

1 files changed, 95 insertions, 100 deletions

diff --git a/config/apache_mod_security-dev/apache_virtualhost.xml b/config/apache_mod_security-dev/apache_virtualhost.xml
index b3653bdf..53478721 100644
--- a/config/apache_mod_security-dev/apache_virtualhost.xml
+++ b/config/apache_mod_security-dev/apache_virtualhost.xml
@@ -4,40 +4,41 @@
 <packagegui>
         <copyright>
         <![CDATA[
-			/* $Id$ */
-			/* ========================================================================== */
-			/*
-    			apache_virtualhost.xml
-    			part of apache_mod_security package (http://www.pfSense.com)
-    			Copyright (C)2009, 2010 Scott Ullrich
-    			Copyright (C)2012 Marcello Coutinho
-    			All rights reserved.
-			*/
-			/* ========================================================================== */
-			/*
-			    Redistribution and use in source and binary forms, with or without
-			    modification, are permitted provided that the following conditions are met:
+/* $Id$ */
+/* ========================================================================== */
+/*
+    apache_virtualhost.xml
+    part of apache_mod_security package (http://www.pfSense.com)
+    Copyright (C)2009, 2010 Scott Ullrich
+    Copyright (C)2012 Marcello Coutinho
+    Copyright (C)2013 Stephane Lapie <stephane.lapie@asahinet.com>
+    All rights reserved.
+*/
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
 
-			     1. Redistributions of source code MUST retain the above copyright notice,
-			        this list of conditions and the following disclaimer.
+     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
-			        notice, this list of conditions and the following disclaimer in the
-			        documentation and/or other materials provided with the distribution.
+     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.
 
-			    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-			    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-			    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-			    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-			    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-			    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-			    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-			    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-			    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-			    POSSIBILITY OF SUCH DAMAGE.
-			*/
-			/* ========================================================================== */
-			]]>
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ========================================================================== */
+]]>
         </copyright>
 	<name>apachevirtualhost</name>
 	<version>1.0</version>
@@ -143,7 +144,7 @@
 			<tab_level>2</tab_level>
 		</tab>
 		<tab>
-			<text>Virutal Hosts</text>
+			<text>Virtual Hosts</text>
 			<url>/pkg.php?xml=apache_virtualhost.xml</url>
 			<tab_level>2</tab_level>
 			<active/>
@@ -201,17 +202,14 @@
 			<description>Select protocols that this virtual host will accept connections</description>
 			<type>select</type>			
 			<options>
-			    <option><name>HTTP</name><value>http</value></option>
-			    <option><name>HTTPS</name><value>https</value></option>
+				<option><name>HTTP</name><value>http</value></option>
+				<option><name>HTTPS</name><value>https</value></option>
 			</options>
 		</field>
 		<field>
 			<fielddescr>Server Name(s)</fielddescr>
 			<fieldname>primarysitehostname</fieldname>
-			<description>
-				<![CDATA[Enter hostnames one per line in FQDN format for this website (e.g. www.example.com)<br/>
-					Leave blank and define the IP Address / port above for IP site proxy (i.e. not named site proxy)]]>
-			</description>
+			<description><![CDATA[Enter hostnames one per line in FQDN format for this website (e.g. www.example.com)<br/>Leave blank and define the IP Address / port above for IP site proxy (i.e. not named site proxy)]]></description>
 			<cols>40</cols>
 			<rows>2</rows>
 			<type>textarea</type>
@@ -238,27 +236,21 @@
 			<fielddescr>Site Webmaster E-Mail address</fielddescr>
 			<fieldname>siteemail</fieldname>
 			<size>50</size>
-			<description>
-				<![CDATA[
-					Enter the Webmaster E-Mail address for this site.
-				]]>
-			</description>
+			<description><![CDATA[Enter the Webmaster E-Mail address for this site.]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Site description</fielddescr>
 			<fieldname>description</fieldname>
 			<size>50</size>
-			<description>
-				<![CDATA[Enter a site description]]>
-			</description>
+			<description><![CDATA[Enter a site description]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>HTTPS SSL certificate</fielddescr>
 			<fieldname>ssl_cert</fieldname>
 			<description>Choose the SSL Server Certificate here.</description>
-	    	<type>select_source</type>
+			<type>select_source</type>
 			<source><![CDATA[$config['cert']]]></source>
 			<source_name>descr</source_name>
 			<source_value>refid</source_value>
@@ -283,62 +275,62 @@
 				<![CDATA[Location(s)]]>
 			</fielddescr>
 			<fieldname>locations</fieldname>
-		    <type>rowhelper</type>
-		    <dontdisplayname/>
+			<type>rowhelper</type>
+			<dontdisplayname/>
 			<usecolspan2/>
 			<movable>on</movable>
-		    <rowhelper>
+			<rowhelper>
 				<rowhelperfield>
-				    <fielddescr><![CDATA[gzip?]]></fielddescr>
-				    <fieldname>compress</fieldname>
-				    <description>Compress data to save bandwidth?</description>
+					<fielddescr><![CDATA[gzip?]]></fielddescr>
+					<fieldname>compress</fieldname>
+					<description>Compress data to save bandwidth?</description>
 				   	<type>select</type>			
 					<options>
-			    	<option><name>yes</name><value>yes</value></option>
-			    	<option><name>no</name><value>no</value></option>
+					<option><name>yes</name><value>yes</value></option>
+					<option><name>no</name><value>no</value></option>
 					</options>
 				</rowhelperfield>
 				<rowhelperfield>
-				    <fielddescr><![CDATA[site path]]></fielddescr>
-				    <fieldname>sitepath</fieldname>
-				    <description><![CDATA[Site path to publish.<br>leave blank to use /]]></description>
-				    <type>input</type>
-				    <size>12</size>
+					<fielddescr><![CDATA[Site Path]]></fielddescr>
+					<fieldname>sitepath</fieldname>
+					<description><![CDATA[Site path to publish.<br>leave blank to use /]]></description>
+					<type>input</type>
+					<size>12</size>
 				</rowhelperfield>
 				<rowhelperfield>
 					<fielddescr><![CDATA[Balancer]]></fielddescr>
-				    <fieldname>balancer</fieldname>
-				    <description>Server balancer / pool</description>
+					<fieldname>balancer</fieldname>
+					<description>Server balancer / pool</description>
 					<source><![CDATA[$config['installedpackages']['apachebalancer']['config']]]></source>
 					<source_name>name</source_name>
 					<source_value>name</source_value>
 					<show_disable_value>none</show_disable_value>
 					<type>select_source</type>
-                    <size>5</size>
+					<size>5</size>
 				</rowhelperfield>
 				<rowhelperfield>
-					<fielddescr><![CDATA[<a href='https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass'>LbMethod</a>]]></fielddescr>
-				    <fieldname>lbmethod</fieldname>
-				    <description>Server balance method</description>
-				    <type>select</type>
-				    <options>
-			    	<option><name>byrequests</name><value>byrequests</value></option>
-			    	<option><name>bytraffic</name><value>bytraffic</value></option>
-			    	<option><name>bybusyness</name><value>bybusyness</value></option>
+					<fielddescr><![CDATA[<a href='https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass'>LB Method</a>]]></fielddescr>
+					<fieldname>lbmethod</fieldname>
+					<description>Server balance method</description>
+					<type>select</type>
+					<options>
+						<option><name>byrequests</name><value>byrequests</value></option>
+						<option><name>bytraffic</name><value>bytraffic</value></option>
+						<option><name>bybusyness</name><value>bybusyness</value></option>
 					</options>
 				</rowhelperfield>
 				<rowhelperfield>
-				    <fielddescr>Backend path</fielddescr>
-				    <fieldname>backendpath</fieldname>
-				    <description><![CDATA[Backend redirect path.<br>Leave blank to use /]]></description>
-				    <type>input</type>
-				    <size>12</size>
+					<fielddescr>Backend Path</fielddescr>
+					<fieldname>backendpath</fieldname>
+					<description><![CDATA[Backend redirect path.<br>Leave blank to use /]]></description>
+					<type>input</type>
+					<size>12</size>
 				</rowhelperfield>
 				<rowhelperfield>
 					<fielddescr><![CDATA[ModSecurity]]></fielddescr>
 					<fieldname>modsecgroup</fieldname>
-					<description>Choose Modsecurity group to use on this virtual host.</description>
-			    	<type>select_source</type>
+					<description>Choose ModSecurity group to use on this virtual host.</description>
+					<type>select_source</type>
 					<source><![CDATA[$config['installedpackages']['apachemodsecuritygroups']['config']]]></source>
 					<source_name>name</source_name>
 					<source_value>name</source_value>
@@ -348,20 +340,29 @@
 					<fielddescr><![CDATA[Manipulations]]></fielddescr>
 					<fieldname>modsecmanipulation</fieldname>
 					<description>Choose Modsecurity group to use on this virtual host.</description>
-			    	<type>select_source</type>
+					<type>select_source</type>
 					<source><![CDATA[$config['installedpackages']['apachemodsecuritymanipulation']['config']]]></source>
 					<source_name>name</source_name>
 					<source_value>name</source_value>
 					<show_disable_value>none</show_disable_value>
 				</rowhelperfield>
 				<rowhelperfield>
-				    <fielddescr><![CDATA[<a href='https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass'>&nbsp;&nbsp;Balancer options</a>]]></fielddescr>
-				    <fieldname>options</fieldname>
-				    <description><![CDATA[Additional proxypass options for this path.<br>ex: ttl=60 stickysession='JSESSIONID']]></description>
-				    <type>input</type>
-				    <size>11</size>
+					<fielddescr><![CDATA[<a href='https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass'>&nbsp;&nbsp;Balancer options</a>]]></fielddescr>
+					<fieldname>options</fieldname>
+					<description><![CDATA[Additional proxypass options for this path.<br>ex: ttl=60 stickysession='JSESSIONID']]></description>
+					<type>input</type>
+					<size>11</size>
 				</rowhelperfield>
-		    </rowhelper>
+				<rowhelperfield>
+					<fielddescr>Location Custom Settings</fielddescr>
+					<fieldname>custom</fieldname>
+					<description><![CDATA[Pass extra Apache config for this Location. This is useful for SSLRequire rules for example.]]></description>
+					<type>textarea</type>
+					<cols>65</cols>
+					<rows>10</rows>
+					<encoding>base64</encoding>
+				</rowhelperfield>
+			</rowhelper>
 		</field>
 		<field>
 			<name>Logging</name>
@@ -370,25 +371,19 @@
 		<field>
 			<fielddescr>Preserve Proxy hostname</fielddescr>
 			<fieldname>preserveproxyhostname</fieldname>
-			<description>
-				<![CDATA[
-					When enabled, this option will pass the Host: line from the incoming request to the proxied host, instead of the backend IP address.
-				]]>
-			</description>
+			<description><![CDATA[When enabled, this option will pass the Host: line from the incoming request to the proxied host, instead of the backend IP address.]]></description>
 			<type>checkbox</type>
 		</field>
 			<field>
 			<fielddescr>Log file</fielddescr>
 			<fieldname>logfile</fieldname>
-			<description>
-				<![CDATA[Enable access and error log for this virtual host.]]>
-			</description>
+			<description><![CDATA[Enable access and error log for this virtual host.]]></description>
 			<type>select</type>			
-					<options>
-			    	<option><name>Log to default apache log file</name><value>default</value></option>
-			    	<option><name>Create a log file for this site</name><value>create</value></option>
-			    	<option><name>Do not not this website</name><value>disabled</value></option>
-					</options>
+			<options>
+				<option><name>Log to default apache log file</name><value>default</value></option>
+				<option><name>Create a log file for this site</name><value>create</value></option>
+				<option><name>Do not log this website</name><value>disabled</value></option>
+			</options>
 		</field>
 		<field>
 			<name>Custom Options</name>
@@ -397,7 +392,7 @@
 		<field>
 			<fielddescr>Custom Options</fielddescr>
 			<fieldname>custom</fieldname>
-			<description>Paste extra apache config for this virtualhost. This is usefull for rewrite rules for example.</description>
+			<description>Pass extra Apache config for this VirtualHost. This is useful for Rewrite rules for example.</description>
 			<type>textarea</type>
 			<cols>90</cols>
 			<rows>10</rows>
@@ -415,4 +410,4 @@
 		apache_mod_security_resync();
 	</custom_php_resync_config_command>
 	<include_file>/usr/local/pkg/apache_mod_security.inc</include_file>	
-</packagegui>
\ No newline at end of file
+</packagegui>