diff options
Diffstat (limited to 'config/haproxy')
| -rw-r--r-- | config/haproxy/haproxy.inc | 6 | ||||
| -rw-r--r-- | config/haproxy/haproxy.xml | 3 | ||||
| -rwxr-xr-x | config/haproxy/haproxy_global.php | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index 72d9535d..1e29f358 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"); @@ -747,7 +747,7 @@ function haproxy_do_xmlrpc_sync($sync_to_ip, $password) { $cli->setCredentials('admin', $password); $resp = $cli->send($msg, "250"); if(!$resp) { - $error = "A communications error occurred while attempting HAProxy XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; + $error = "A communications error occurred while attempting HAProxy XMLRPC sync with {$url}:{$port} (exec_php)."; log_error($error); file_notice("sync_settings", $error, "HAProxy Settings Reload", ""); } elseif($resp->faultCode()) { @@ -757,7 +757,7 @@ function haproxy_do_xmlrpc_sync($sync_to_ip, $password) { log_error($error); file_notice("sync_settings", $error, "HAProxy Settings Sync", ""); } else { - log_error("HAProxy XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php)."); + log_error("HAProxy XMLRPC reload data success with {$url}:{$port} (exec_php)."); } } diff --git a/config/haproxy/haproxy.xml b/config/haproxy/haproxy.xml index ee2a2263..0c897dc7 100644 --- a/config/haproxy/haproxy.xml +++ b/config/haproxy/haproxy.xml @@ -96,10 +96,13 @@ <custom_php_resync_config_command> </custom_php_resync_config_command> <custom_php_install_command> + /* + included in package install $freebsdv=trim(`uname -r | cut -d'.' -f1`); conf_mount_rw(); `fetch -q -o /usr/local/sbin/ http://www.pfsense.org/packages/config/haproxy/binaries{$freebsdv}/haproxy`; exec("chmod a+rx /usr/local/sbin/haproxy"); + */ haproxy_custom_php_install_command(); </custom_php_install_command> <custom_php_deinstall_command> diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php index 1ef28005..340c578b 100755 --- a/config/haproxy/haproxy_global.php +++ b/config/haproxy/haproxy_global.php @@ -289,7 +289,7 @@ function enable_change(enable_change) { foreach($config['virtualip']['vip'] as $carp): if ($carp['mode'] != "carp") continue; $ipaddress = $carp['subnet']; - $carp_int = find_carp_interface($ipaddress); + $carp_int = trim(find_carp_interface($ipaddress)); ?> <option value="<?=$carp_int;?>" <?php if (isset($pconfig['carpdev']) && $carp_int == $pconfig['carpdev']) echo "selected"; ?>> |