diff options
| author | thompsa <andy@fud.org.nz> | 2010-03-12 16:06:44 +1300 |
|---|---|---|
| committer | thompsa <andy@fud.org.nz> | 2010-03-12 16:06:44 +1300 |
| commit | dbe7a7f25fb3ca9880adf7e9df5c0e6a9d67dcb2 (patch) | |
| tree | f0003ee673185172922527bb57bf778532489d52 | |
| parent | 6ce02af23da46d2aa84723285313f6a9c87458d5 (diff) | |
| download | pfsense-packages-dbe7a7f25fb3ca9880adf7e9df5c0e6a9d67dcb2.tar.gz pfsense-packages-dbe7a7f25fb3ca9880adf7e9df5c0e6a9d67dcb2.tar.bz2 pfsense-packages-dbe7a7f25fb3ca9880adf7e9df5c0e6a9d67dcb2.zip | |
Only install the cron entry if we are monitoring carp.
| -rw-r--r-- | config/haproxy-dev/haproxy.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/haproxy-dev/haproxy.inc b/config/haproxy-dev/haproxy.inc index 61cc71e6..eff614ec 100644 --- a/config/haproxy-dev/haproxy.inc +++ b/config/haproxy-dev/haproxy.inc @@ -65,7 +65,6 @@ function haproxy_custom_php_deinstall_command() { exec("rm /usr/local/etc/rc.d/haproxy.sh"); exec("rm /etc/devd/haproxy.conf"); exec("/etc/rc.d/devd restart"); - haproxy_install_cron(false); } function haproxy_custom_php_install_command() { @@ -156,7 +155,6 @@ EOD; fclose($fd); exec("/etc/rc.d/devd restart"); - haproxy_install_cron(true); conf_mount_ro(); exec("/usr/local/etc/rc.d/haproxy.sh start"); @@ -536,6 +534,11 @@ function haproxy_writeconf() { // create config file fclose($fd); + if (isset($a_global['carpdev'])) + haproxy_install_cron(true); + else + haproxy_install_cron(false); + $freebsd_version = substr(trim(`uname -r`), 0, 1); if(!file_exists("/usr/bin/limits")) { exec("fetch -q -o /usr/bin/limits http://files.pfsense.org/extras/{$freebsd_version}/limits"); |