diff options
| author | doktornotor <notordoktor@gmail.com> | 2015-11-01 17:56:19 +0100 |
|---|---|---|
| committer | doktornotor <notordoktor@gmail.com> | 2015-11-01 17:56:19 +0100 |
| commit | d2efd7b174e2010c99e24ece40d2cf09787cb0b2 (patch) | |
| tree | 70e99f8699b15c600314b0e3c3b73f4ab428b578 /config/squid3/31 | |
| parent | 0e25345c2f8791c6fd60310cf7ff348852234cae (diff) | |
| download | pfsense-packages-d2efd7b174e2010c99e24ece40d2cf09787cb0b2.tar.gz pfsense-packages-d2efd7b174e2010c99e24ece40d2cf09787cb0b2.tar.bz2 pfsense-packages-d2efd7b174e2010c99e24ece40d2cf09787cb0b2.zip | |
squid3 - fix XMLRPC sync with CARP/HA
Diffstat (limited to 'config/squid3/31')
| -rw-r--r-- | config/squid3/31/squid.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/squid3/31/squid.inc b/config/squid3/31/squid.inc index d565810c..df900e43 100644 --- a/config/squid3/31/squid.inc +++ b/config/squid3/31/squid.inc @@ -1854,8 +1854,8 @@ function squid_sync_on_changes() { $synctimeout = $squid_sync['synctimeout']; switch ($synconchanges){ case "manual": - if (is_array($squid_sync[row])){ - $rs=$squid_sync[row]; + if (is_array($squid_sync['row'])){ + $rs=$squid_sync['row']; } else{ log_error("[squid] xmlrpc sync is enabled but there is no hosts to push on squid config."); @@ -1863,8 +1863,8 @@ function squid_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']; |