aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <andy@fud.org.nz>2010-02-08 12:59:16 +1300
committerthompsa <andy@fud.org.nz>2010-02-08 12:59:16 +1300
commita0da2cb16356f9ec70d8d0cb7cd6c077a863813c (patch)
treecf640da86f5960989fb9663d83948cf870934ec1
parentcc3044cdf96229c0d004e619b17fd6b3408d0019 (diff)
downloadpfsense-packages-a0da2cb16356f9ec70d8d0cb7cd6c077a863813c.tar.gz
pfsense-packages-a0da2cb16356f9ec70d8d0cb7cd6c077a863813c.tar.bz2
pfsense-packages-a0da2cb16356f9ec70d8d0cb7cd6c077a863813c.zip
Provide default for expr and fix typeo.
-rw-r--r--config/haproxy-dev/haproxy.inc2
-rwxr-xr-xconfig/haproxy-dev/haproxy_listeners_edit.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/haproxy-dev/haproxy.inc b/config/haproxy-dev/haproxy.inc
index e60823b3..ba39e5c9 100644
--- a/config/haproxy-dev/haproxy.inc
+++ b/config/haproxy-dev/haproxy.inc
@@ -235,6 +235,8 @@ function haproxy_configure() {
$expr = 'path_dir -i';
else if ($acl['expression'] == "source_ip")
$expr = 'src';
+ else
+ $expr = $acl['expression'];
$expr .= " " . $acl['value'];
fwrite ($fd, "\tacl\t\t\t".$acl['name']."\t".$expr."\n");
}
diff --git a/config/haproxy-dev/haproxy_listeners_edit.php b/config/haproxy-dev/haproxy_listeners_edit.php
index 8f61de11..8d948dd9 100755
--- a/config/haproxy-dev/haproxy_listeners_edit.php
+++ b/config/haproxy-dev/haproxy_listeners_edit.php
@@ -51,7 +51,7 @@ $a_expr[] = array("path_ends_with", "Path ends with:", "HTTP");
$a_expr[] = array("path_matches", "Path matches:", "HTTP");
$a_expr[] = array("path_regex", "Path regex:", "HTTP");
$a_expr[] = array("path_contains", "Path contains:", "HTTP");
-$a_expr[] = array("source_up", "Source IP:", "");
+$a_expr[] = array("source_ip", "Source IP:", "");
if (isset($_POST['id']))
$id = $_POST['id'];