From 00749933c6c09280683271dfbe6d3f3140be1a4f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 30 Sep 2015 17:14:08 +0200 Subject: Fix log_dir location for C-ICAP to that it honors custom log_dir --- config/squid3/34/squid.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'config') 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@"; -- cgit v1.2.3