File: use_squid3-log.diff

package info (click to toggle)
calamaris 2.99.4.7-1
  • links: PTS
  • area: main
  • in suites: bookworm
  • size: 928 kB
  • sloc: perl: 7,592; sh: 441; makefile: 11
file content (17 lines) | stat: -rw-r--r-- 504 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
 
Author: Brian Murray <brian@ubuntu.com>
Description: If a squid3 log file is present use that instead of a squid log file
Forwarded: yes
Last-Update: 2013-08-26
--- a/calamaris-cron-script
+++ b/calamaris-cron-script
@@ -74,6 +74,10 @@ eval `awk -F= \
 
 # look for cache log files
 if [ "$CACHE" = "auto" ]; then
+    if [ -r /var/log/squid3/$CACHEFILE ]; then
+	CACHE=squid
+	CACHELOGDIR=/var/log/squid3
+    fi
     if [ -r /var/log/squid/$CACHEFILE ]; then
 	CACHE=squid
 	CACHELOGDIR=/var/log/squid