From a0da2cb16356f9ec70d8d0cb7cd6c077a863813c Mon Sep 17 00:00:00 2001 From: thompsa Date: Mon, 8 Feb 2010 12:59:16 +1300 Subject: Provide default for expr and fix typeo. --- config/haproxy-dev/haproxy.inc | 2 ++ config/haproxy-dev/haproxy_listeners_edit.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config/haproxy-dev') 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']; -- cgit v1.2.3