From 1ece4960bec4edafa3b678fbab29dd7db65550fd Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 27 Apr 2010 22:27:50 -0400
Subject: Allow matching against regexes in the URL as well

---
 config/varnish64/varnish.inc          |  6 +++++-
 config/varnish64/varnish_backends.xml | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'config/varnish64')

diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc
index 33525bdf..042db490 100644
--- a/config/varnish64/varnish.inc
+++ b/config/varnish64/varnish.inc
@@ -124,10 +124,14 @@ EOAU;
 		foreach($config['installedpackages']['varnishbackends']['config'] as $urlmapping) {
 			if($urlmapping['row'])
 				foreach($urlmapping['row'] as $url) {
+					if($url['fieldtype']) 
+						$fieldtype = $url['fieldtype'];
+					else 
+						$fieldtype = "==";
 					if(!$isfirst) 
 						$urlmappings .= "else ";
 					$urlmappings .= <<<EOAU
-if (req.http.host == "{$url['urlmapping']}") {
+if (req.http.host {$fieldtype} "{$url['urlmapping']}") {
 		set req.backend = {$urlmapping['backendname']}BACKEND;
 		set req.http.host = "{$url['urlmapping']}";
 	} 
diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index d3bd825e..e426d444 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -175,6 +175,22 @@
 			<fieldname>MapURLs</fieldname>
 		    <type>rowhelper</type>
 		    <rowhelper>
+				<rowhelperfield>
+				    <fielddescr>Match type</fielddescr>
+				    <fieldname>fieldtype</fieldname>
+				    <description>Select the field type that you would like to use in matching the URL.</description>
+					<type>select</type>
+					<options>
+						<option>
+							<name>Equals</name>
+							<value>==</value>
+						</option>
+						<option>
+							<name>Regex</name>
+							<value>~</value>
+						</option>
+					</options>
+				</rowhelperfield>
 				<rowhelperfield>
 				    <fielddescr>URL</fielddescr>
 				    <fieldname>urlmapping</fieldname>
-- 
cgit v1.2.3