- update so this somehow works now

Changed files:
    calamaris-croniface -> 1.13
    calamaris.sysconfig -> 1.11

diff --git a/calamaris-croniface b/calamaris-croniface
index 6a0444917329acaaa66670468af55571a5566d89..249019c2664cd036ab48b13ca2748aa31b4e285f 100644 (file)
--- a/calamaris-croniface
+++ b/calamaris-croniface
@@ -39,7 +39,8 @@ CALAMARIS_ARGS="-a"
 [ -f /etc/sysconfig/calamaris ] && . /etc/sysconfig/calamaris
 
 # Parameter passed to Calamaris.
-ARG_HTML="$CALAMARIS_ARGS -F html -l $HTML_LOGO"
+# XXX: passing -l HTML_LOGO breaks here due
+ARG_HTML="$CALAMARIS_ARGS -F html"
 ARG_MAIL="$CALAMARIS_ARGS -a -m Calamaris report"
 MAIL_SUBJ="Calamaris Report"
 

diff --git a/calamaris.sysconfig b/calamaris.sysconfig
index f8415aa5213d936c75925fd1884e96fd220ed169..ad5d1745a12695da32df0cebe401d2d6593654e0 100644 (file)
--- a/calamaris.sysconfig
+++ b/calamaris.sysconfig
@@ -52,7 +52,8 @@ OUTPUT_DIR="/home/services/httpd/html/cache_log"
 # Logs to parse in order to create daily stats. Because of assumption that
 # this script is run *after* logrotate, log file is already gzipped. There
 # is no default. You have to put something here.
-DAILY_FILES="/var/log/archive/squid/access.log.1.gz"
+# DAILY_FILES="/var/log/archive/squid/access.log.1.gz"
+DAILY_FILES=$(ls -1t /var/log/archive/squid/access.log-*.gz | head -n 1)
 
 # Where to save daily stats. Ignored if DAILY_ACTION doesn't contain "save".
 # There is no default. You have to put something here.
@@ -66,7 +67,8 @@ DAILY_SAVE_AS="$OUTPUT_DIR/daily.html"
 # Logs to parse in order to create weekly stats. Because of assumption that
 # this script is run *after* logrotate, all log files are already gzipped.
 # There is no default. You have to put something here.
-WEEKLY_FILES=/var/log/archive/squid/access.log.{7,6,5,4,3,2,1}*
+# WEEKLY_FILES=/var/log/archive/squid/access.log.{7,6,5,4,3,2,1}*
+WEEKLY_FILES=/var/log/archive/squid/access.log-*.gz
 
 # Where to save weekly stats. Ignored if WEEKLY_ACTION doesn't contain "save".
 # There is no default. You have to put something here.