summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Larson <slioch@eng-140.vyatta.com>2008-03-21 11:50:59 -0700
committerMichael Larson <slioch@eng-140.vyatta.com>2008-03-21 11:50:59 -0700
commitbc92b1ef9d79ec9f25b2abd471ec9dd1da912ab3 (patch)
tree2a211daf184e572e83f5e4bfa046ff13c095b9bf
parent1693cdf87f883464a10d4a91bdc32e8a595444a2 (diff)
downloadvyatta-wanloadbalance-bc92b1ef9d79ec9f25b2abd471ec9dd1da912ab3.tar.gz
vyatta-wanloadbalance-bc92b1ef9d79ec9f25b2abd471ec9dd1da912ab3.zip
removed network from configuration. changed configuration error without valid rule to warning. fixed up path to iptables for status show command.
-rw-r--r--scripts/vyatta-wanloadbalance.pl4
-rw-r--r--templates/load-balancing/wan/rule/node.tag/destination/network/node.def2
-rw-r--r--templates/load-balancing/wan/rule/node.tag/source/network/node.def2
-rw-r--r--templates/show/wan-load-balance/status/node.def2
4 files changed, 4 insertions, 6 deletions
diff --git a/scripts/vyatta-wanloadbalance.pl b/scripts/vyatta-wanloadbalance.pl
index 69fadcd..d1fd78f 100644
--- a/scripts/vyatta-wanloadbalance.pl
+++ b/scripts/vyatta-wanloadbalance.pl
@@ -175,7 +175,9 @@ sub write_rules {
}
if ($valid eq "false") {
- print "At least one interface must be configured for a rule to be valid\n";
+ print "At least one rule with interface must be defined for wan load balancing to be active\n";
+ #allow this configuration, just generate the warning
+ return "true";
}
return $valid;
}
diff --git a/templates/load-balancing/wan/rule/node.tag/destination/network/node.def b/templates/load-balancing/wan/rule/node.tag/destination/network/node.def
deleted file mode 100644
index e742281..0000000
--- a/templates/load-balancing/wan/rule/node.tag/destination/network/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IPv4 Network address
diff --git a/templates/load-balancing/wan/rule/node.tag/source/network/node.def b/templates/load-balancing/wan/rule/node.tag/source/network/node.def
deleted file mode 100644
index b88ec3d..0000000
--- a/templates/load-balancing/wan/rule/node.tag/source/network/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IPv4 network address
diff --git a/templates/show/wan-load-balance/status/node.def b/templates/show/wan-load-balance/status/node.def
index 6fa010f..07fd1a0 100644
--- a/templates/show/wan-load-balance/status/node.def
+++ b/templates/show/wan-load-balance/status/node.def
@@ -1,6 +1,6 @@
help: Show wan load-balancing statistics
run: if [ -f /var/load-balance/wlb.out ] ; then
- sudo ${vyatta_bindir}/sudo-users/iptables -L PREROUTING -t mangle -vv
+ sudo /sbin/iptables -L PREROUTING -t mangle -vv
else
echo WAN load balancing is not configured
fi