aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2014-03-13 18:45:20 +0100
committerPiBa-NL <pba_2k3@yahoo.com>2014-03-13 18:45:20 +0100
commit2a4f986325ccd3a08273bee285993415da12aeb2 (patch)
tree970dd20e78612555febe917b43587c4060733476 /config
parent74e72fde07380105b8109e94afded71a5ca1338f (diff)
downloadpfsense-packages-2a4f986325ccd3a08273bee285993415da12aeb2.tar.gz
pfsense-packages-2a4f986325ccd3a08273bee285993415da12aeb2.tar.bz2
pfsense-packages-2a4f986325ccd3a08273bee285993415da12aeb2.zip
haproxy-devel, removing obsolete nonworking 'devd' and 'limits' calls
Diffstat (limited to 'config')
-rw-r--r--config/haproxy-devel/haproxy.inc42
1 files changed, 0 insertions, 42 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index e58187c0..273091b3 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -162,18 +162,11 @@ function haproxy_custom_php_deinstall_command() {
global $static_output;
$static_output .= "HAProxy, running haproxy_custom_php_deinstall_command()\n";
update_output_window($static_output);
- $static_output .= "HAProxy, deleting haproxy package\n";
- update_output_window($static_output);
- exec("cd /var/db/pkg && pkg_delete `ls | grep haproxy`");
$static_output .= "HAProxy, deleting haproxy webgui\n";
update_output_window($static_output);
exec("rm /usr/local/pkg/haproxy*");
exec("rm /usr/local/www/haproxy*");
exec("rm /usr/local/etc/rc.d/haproxy.sh");
- exec("rm /etc/devd/haproxy.conf");
- $static_output .= "HAProxy, running /etc/rc.d/devd restart\n";
- update_output_window($static_output);
- exec("/etc/rc.d/devd restart");
$static_output .= "HAProxy, installing cron job if needed\n";
update_output_window($static_output);
haproxy_install_cron(false);
@@ -190,16 +183,6 @@ function haproxy_custom_php_install_command() {
update_output_window($static_output);
conf_mount_rw();
- $freebsd_version = substr(trim(php_uname("r")), 0, 1);
-
- if(!file_exists("/usr/bin/limits")) {
- $static_output .= "HAProxy, downloading 'limits'\n";
- update_output_window($static_output);
-
- exec("fetch -q -o /usr/bin/limits http://files.pfsense.org/extras/{$freebsd_version}/limits");
- exec("chmod a+rx /usr/bin/limits");
- }
-
$static_output .= "HAProxy, create '/usr/local/etc/rc.d/haproxy.sh'\n";
update_output_window($static_output);
$haproxy = <<<EOD
@@ -265,30 +248,7 @@ EOD;
fclose($fd);
exec("chmod a+rx /usr/local/etc/rc.d/haproxy.sh");
- $static_output .= "HAProxy, create '/etc/devd/haproxy.conf'\n";
- update_output_window($static_output);
- $devd = <<<EOD
-notify 0 {
- match "system" "IFNET";
- match "subsystem" "carp[0-9]+";
- match "type" "LINK_UP";
- action "/usr/local/etc/rc.d/haproxy.sh check";
-};
-notify 0 {
- match "system" "IFNET";
- match "subsystem" "carp[0-9]+";
- match "type" "LINK_DOWN";
- action "/usr/local/etc/rc.d/haproxy.sh check";
-};
-EOD;
- exec("mkdir -p /etc/devd");
- $fd = fopen("/etc/devd/haproxy.conf", "w");
- fwrite($fd, $devd);
- fclose($fd);
- $static_output .= "HAProxy, running: /etc/rc.d/devd restart \n";
- update_output_window($static_output);
- exec("/etc/rc.d/devd restart");
$static_output .= "HAProxy, update configuration\n";
update_output_window($static_output);
@@ -1178,8 +1138,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();