diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-06 13:07:49 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-06 13:07:49 -0200 |
| commit | ab9e92de7b0f9256aa18bea777c3c15357a189fe (patch) | |
| tree | f742cf67698cbcb2ddc4cf2ddb6badf5cefdc19b | |
| parent | 33eb9c0ba200d71ba9ddc1dd84acf62fd6c2ddba (diff) | |
| parent | cf180efeba6f94433eadfc1365f96eeb9ce4878a (diff) | |
| download | pfsense-packages-ab9e92de7b0f9256aa18bea777c3c15357a189fe.tar.gz pfsense-packages-ab9e92de7b0f9256aa18bea777c3c15357a189fe.tar.bz2 pfsense-packages-ab9e92de7b0f9256aa18bea777c3c15357a189fe.zip | |
Merge pull request #1138 from doktornotor/patch-5
| -rw-r--r-- | config/haproxy-legacy/haproxy.inc | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/config/haproxy-legacy/haproxy.inc b/config/haproxy-legacy/haproxy.inc index 55b86882..9b19bbd4 100644 --- a/config/haproxy-legacy/haproxy.inc +++ b/config/haproxy-legacy/haproxy.inc @@ -345,8 +345,8 @@ function haproxy_sync_on_changes() { } break; case "auto": - if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])){ - $system_carp=$config['installedpackages']['carpsettings']['config'][0]; + if (is_array($config['hasync'])) { + $system_carp = $config['hasync']; $rs[0]['ipaddress']=$system_carp['synchronizetoip']; $rs[0]['username']=$system_carp['username']; $rs[0]['password']=$system_carp['password']; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index f59550f2..a5df9a0b 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -149,9 +149,9 @@ (Legacy version)]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.4.24 pkg v 1.1.2</version> + <version>1.4.24 pkg v 1.1.3</version> <status>Release</status> - <required_version>2.0</required_version> + <required_version>2.1</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file> <configurationfile>haproxy.xml</configurationfile> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 4f31325e..23eed08b 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -136,9 +136,9 @@ (Legacy version)]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.4.24 pkg v 1.1.2</version> + <version>1.4.24 pkg v 1.1.3</version> <status>Release</status> - <required_version>2.0</required_version> + <required_version>2.1</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file> <configurationfile>haproxy.xml</configurationfile> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> |