diff options
| author | doktornotor <notordoktor@gmail.com> | 2015-09-30 17:14:08 +0200 |
|---|---|---|
| committer | doktornotor <notordoktor@gmail.com> | 2015-09-30 17:14:08 +0200 |
| commit | 00749933c6c09280683271dfbe6d3f3140be1a4f (patch) | |
| tree | 5671309f2b1e247ef4291163287a250eb1039cf4 | |
| parent | 109b1e565344581ebecfbefed8e482b1ebc48f37 (diff) | |
| download | pfsense-packages-00749933c6c09280683271dfbe6d3f3140be1a4f.tar.gz pfsense-packages-00749933c6c09280683271dfbe6d3f3140be1a4f.tar.bz2 pfsense-packages-00749933c6c09280683271dfbe6d3f3140be1a4f.zip | |
Fix log_dir location for C-ICAP to that it honors custom log_dir
| -rwxr-xr-x | config/squid3/34/squid.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index ed3367d3..8188dfda 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -1533,7 +1533,12 @@ EOF; $cicap_m[0] = "@Manager:Apassword\S+@"; $cicap_r[0] = ""; // XXX: Bug #4615 - $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs'); + if (is_array($config['installedpackages']['squid'])) { + $squidsettings = $config['installedpackages']['squid']['config'][0]; + } else { + $squidsettings = array(); + } + $logdir = ($squidsettings['log_dir'] ? $squidsettings['log_dir'] : '/var/squid/logs'); $cicap_m[1] = "@DebugLevel\s1@"; $cicap_r[1] = "DebugLevel 0"; $cicap_m[2] = "@AccessLog /var/log/c-icap/access.log@"; |