aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy-devel/haproxy.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@pfSense.org>2014-02-28 13:57:26 -0300
committerRenato Botelho <garga@pfSense.org>2014-02-28 13:57:26 -0300
commit94f1e24848930c2fa8618ce01ea2fb0a50c1559f (patch)
tree6aa102258c1a0d424c9868f8931879585757ebe6 /config/haproxy-devel/haproxy.inc
parent464a48605e7e8edfe0b2476ac66deb23e937dc3f (diff)
parent29f8c0f3d4ebbf977768f57bff8048387b60ed3b (diff)
downloadpfsense-packages-94f1e24848930c2fa8618ce01ea2fb0a50c1559f.tar.gz
pfsense-packages-94f1e24848930c2fa8618ce01ea2fb0a50c1559f.tar.bz2
pfsense-packages-94f1e24848930c2fa8618ce01ea2fb0a50c1559f.zip
Merge pull request #611 from PiBa-NL/hap_reloadcheck
haproxy-devel, dont reload firewall rules every 2 minutes.
Diffstat (limited to 'config/haproxy-devel/haproxy.inc')
-rw-r--r--config/haproxy-devel/haproxy.inc14
1 files changed, 6 insertions, 8 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index d039b55a..9bc0dd80 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -1137,14 +1137,6 @@ function haproxy_check_run($reload) {
$a_global = &$config['installedpackages']['haproxy'];
$configpath = "{$g['varetc_path']}/haproxy";
- exec("/usr/bin/limits -n 300014");
-
- if(use_transparent_clientip_proxying()) {
- filter_configure();
- load_ipfw_rules();
- } else
- mwexec("/usr/local/sbin/ipfw_context -d haproxy", true);
-
if(isset($a_global['enable'])) {
if (isset($a_global['carpdev'])) {
$status = get_carp_interface_status($a_global['carpdev']);
@@ -1163,6 +1155,12 @@ function haproxy_check_run($reload) {
} else if ($reload == 0)
return (0);
+ if(use_transparent_clientip_proxying()) {
+ filter_configure();
+ load_ipfw_rules();
+ } else
+ mwexec("/usr/local/sbin/ipfw_context -d haproxy", true);
+
if (haproxy_is_running()) {
if (isset($a_global['terminate_on_reload']))
$sf_st = "-st";//terminate old process as soon as the new process is listening