diff options
author | Renato Botelho <renato@netgate.com> | 2015-08-28 09:01:07 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-08-28 09:01:07 -0300 |
commit | 3977f59b180791156208cd6865eef5cae734f044 (patch) | |
tree | 85076ce952355cf3894a5b3f52726439445f0656 /config/haproxy1_5/pkg/haproxy.inc | |
parent | 66dad7feacac607560844228c0cd58537bc1a994 (diff) | |
parent | 3bdbee31d112b473ce66bcd321cdcd706dc17131 (diff) | |
download | pfsense-packages-3977f59b180791156208cd6865eef5cae734f044.tar.gz pfsense-packages-3977f59b180791156208cd6865eef5cae734f044.tar.bz2 pfsense-packages-3977f59b180791156208cd6865eef5cae734f044.zip |
Merge pull request #1024 from doktornotor/patch-4
Diffstat (limited to 'config/haproxy1_5/pkg/haproxy.inc')
-rw-r--r-- | config/haproxy1_5/pkg/haproxy.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/haproxy1_5/pkg/haproxy.inc b/config/haproxy1_5/pkg/haproxy.inc index eceef783..8ba7e437 100644 --- a/config/haproxy1_5/pkg/haproxy.inc +++ b/config/haproxy1_5/pkg/haproxy.inc @@ -360,10 +360,6 @@ function haproxy_custom_php_install_command() { $static_output .= "HAProxy, running haproxy_custom_php_install_command()\n"; update_output_window($static_output); - $static_output .= "HAProxy, conf_mount_rw\n"; - update_output_window($static_output); - conf_mount_rw(); - $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") $haproxy_binary = "/usr/pbi/haproxy-devel-" . php_uname("m") . "/sbin/haproxy"; @@ -468,10 +464,6 @@ EOD; require_once('haproxy_upgrade_config.inc'); haproxy_upgrade_config(); - $static_output .= "HAProxy, conf_mount_ro\n"; - update_output_window($static_output); - conf_mount_ro(); - $static_output .= "HAProxy, starting haproxy (if previously enabled)\n"; update_output_window($static_output); haproxy_check_run(1); |