SOURCES: calamaris-croniface, calamaris.sysconfig - update so this somehow ...

[arekm]

Author: arekm                        Date: Wed Dec 17 07:40:25 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update so this somehow works now

---- Files affected:
SOURCES:
   calamaris-croniface (1.12 -> 1.13) , calamaris.sysconfig (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/calamaris-croniface
diff -u SOURCES/calamaris-croniface:1.12 SOURCES/calamaris-croniface:1.13
--- SOURCES/calamaris-croniface:1.12	Mon Apr  9 11:39:26 2007
+++ SOURCES/calamaris-croniface	Wed Dec 17 08:40:19 2008
@@ -39,7 +39,8 @@
 [ -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"
 

================================================================
Index: SOURCES/calamaris.sysconfig
diff -u SOURCES/calamaris.sysconfig:1.10 SOURCES/calamaris.sysconfig:1.11
--- SOURCES/calamaris.sysconfig:1.10	Mon Apr  2 18:41:07 2007
+++ SOURCES/calamaris.sysconfig	Wed Dec 17 08:40:19 2008
@@ -52,7 +52,8 @@
 # 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 @@
 # 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.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/calamaris-croniface?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/calamaris.sysconfig?r1=1.10&r2=1.11&f=u