diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2015-02-10 01:16:37 +0100 |
|---|---|---|
| committer | PiBa-NL <pba_2k3@yahoo.com> | 2015-02-10 01:16:37 +0100 |
| commit | 5f8d58ffef12096558a0fb7a8b6a03f83a50bb06 (patch) | |
| tree | 7de54171d4c10bde08870b72a2e01871854df263 | |
| parent | 5a1a2539145d42ec2cbe15ab6530148d021d18c8 (diff) | |
| download | pfsense-packages-5f8d58ffef12096558a0fb7a8b6a03f83a50bb06.tar.gz pfsense-packages-5f8d58ffef12096558a0fb7a8b6a03f83a50bb06.tar.bz2 pfsense-packages-5f8d58ffef12096558a0fb7a8b6a03f83a50bb06.zip | |
haproxy-devel,bump 0.19, fixed carp monitoring and added conversion from old carp-monitor config
| -rw-r--r-- | config/haproxy-devel/haproxy.inc | 2 | ||||
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy_upgrade_config.inc | 14 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index bc2b0ac8..54cfb81b 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -472,7 +472,7 @@ function haproxy_install_cron($should_install) { $cron_item['month'] = "*"; $cron_item['wday'] = "*"; $cron_item['who'] = "root"; - $cron_item['command'] = "/usr/local/etc/rc.d/haproxy.sh check"; + $cron_item['command'] = "/usr/local/etc/rc.d/haproxy.sh onecheck"; $config['cron']['item'][] = $cron_item; parse_config(true); write_config("haproxy, install cron CARP job"); diff --git a/config/haproxy-devel/pkg/haproxy_upgrade_config.inc b/config/haproxy-devel/pkg/haproxy_upgrade_config.inc index 9c602457..c1c951df 100644 --- a/config/haproxy-devel/pkg/haproxy_upgrade_config.inc +++ b/config/haproxy-devel/pkg/haproxy_upgrade_config.inc @@ -179,6 +179,20 @@ function haproxy_upgrade_config() { } $configversion = "00.17"; } + if ($configversion < "00.19") { + update_output_window($static_output); + $carpint = $config['installedpackages']['haproxy']['carpdev']; + if (is_arrayset($config, 'virtualip', 'vip') && is_arrayset($config, 'installedpackages', 'haproxy')) { + foreach($config['virtualip']['vip'] as $carp) { + $carp_int = "{$carp['interface']}_vip{$carp['vhid']}"; + if ($carp_int == $carpint) { + $config['installedpackages']['haproxy']['carpdev'] = $carp['subnet']; + break; + } + } + } + $configversion = "00.19"; + } $writeconfigupdate = $config['installedpackages']['haproxy']['configversion'] <> $configversion; if ($writeconfigupdate) { diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 3dcefea6..3d9ba67d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -152,7 +152,7 @@ Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5.9 pkg v 0.18</version> + <version>1.5.9 pkg v 0.19</version> <status>Release</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 9d574b48..7dbcec53 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -166,7 +166,7 @@ Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5.3 pkg v 0.18</version> + <version>1.5.3 pkg v 0.19</version> <status>Release</status> <required_version>2.1</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index e8f9f410..b1c00c26 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -153,7 +153,7 @@ Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5.3 pkg v 0.18</version> + <version>1.5.3 pkg v 0.19</version> <status>Release</status> <required_version>2.1</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> |