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