diff options
Diffstat (limited to 'config/haproxy/haproxy.inc')
| -rw-r--r-- | config/haproxy/haproxy.inc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index 72d9535d..96b57190 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -59,7 +59,7 @@ $a_acltypes[] = array('name' => 'source_ip', 'descr' => 'Source IP', 'mode' => '', 'syntax' => 'src'); function haproxy_custom_php_deinstall_command() { - exec("rm /usr/local/sbin/haproxy"); + exec("cd /var/db/pkg && pkg_delete `ls | grep haproxy`"); exec("rm /usr/local/pkg/haproxy.inc"); exec("rm /usr/local/www/haproxy*"); exec("rm /usr/local/etc/rc.d/haproxy.sh"); @@ -156,6 +156,17 @@ EOD; fclose($fd); exec("/etc/rc.d/devd restart"); + /* Workaround for the old package deleting the binary on unload instead of the package */ + if (!file_exists("/usr/local/sbin/haproxy")) { + if (substr(trim(`uname -r`), 0, 1) == "8") { + exec("cd /var/db/pkg && pkg_delete `ls | grep haproxy`"); + if (trim(`uname -m`) == 'i386') + exec("pkg_add -r http://e-sac.siteseguro.ws/pfsense/8/All/haproxy-1.4.18.tbz"); + else + exec("pkg_add -r http://e-sac.siteseguro.ws/pfsense/8/amd64/All/haproxy-1.4.18.tbz"); + } + } + /* Do XML upgrade from haproxy 0.31 to haproxy-dev */ if (is_array($config['installedpackages']['haproxy']['ha_servers'])) { /* We have an old config */ |