- fix indent

[packages/calamaris.git] / calamaris-croniface

diff --git a/calamaris-croniface b/calamaris-croniface
index dec6c7123e000d371968073f8e1f95ef09cce081..17f5b183734d255479d591380317be1acee97b18 100644 (file)
--- a/calamaris-croniface
+++ b/calamaris-croniface
@@ -11,23 +11,27 @@
 #
 # Author:      Micha³ Kochanowicz <mkochano@pld.org.pl>
 
-# Wrapper for Calamaris. Reads configuration and calls Calamaris with
-# appropriate arguments.
-
 # Default configuration.
 SAVE_FORMAT="HTML"
+SAVE_OWNER=
+SAVE_PERM="u=rw,g=r,o=r"
 SEND_FORMAT="plain"
 SEND_TO="root"
+
+# DAILY ---------------------------------------------------------------
 DAILY_ACTION="send"
 DAILY_FILES=
 # If you have an idea of better default setting for this variable you are
 # welcome to change it, but please don't assume that caching proxy is also
 # a http server...
 DAILY_SAVE_AS="/dev/null"
+
+# WEEKLY --------------------------------------------------------------
 WEEKLY_ACTION="send"
 WEEKLY_FILES=
 # See comment above.
 WEEKLY_SAVE_AS="/dev/null"
+
 HTML_LOGO="<H1>Caching Proxy Statistics</H1>"
 CALAMARIS_ARGS="-a"
 
@@ -35,7 +39,7 @@ CALAMARIS_ARGS="-a"
 [ -f /etc/sysconfig/calamaris ] && . /etc/sysconfig/calamaris
 
 # Parameter passed to Calamaris.
-ARG_HTML="$CALAMARIS_ARGS -w -l $LOGO"
+ARG_HTML="$CALAMARIS_ARGS -F html -l $LOGO"
 ARG_MAIL="$CALAMARIS_ARGS -a -m Calamaris report"
 MAIL_SUBJ="Calamaris Report"
 
@@ -47,6 +51,8 @@ call_calamaris() {
        for FILE in $1; do
                if [[ $FILE = *.gz ]]; then
                        zcat $FILE
+               elif [[ $FILE = *.bz2 ]]; then
+                       bzcat $FILE
                else
                        cat $FILE
                fi
@@ -68,6 +74,8 @@ make_stats() {
                        ARG="$ARG_PLAIN"
                fi
                call_calamaris "$1" "$ARG" > $3
+               [ -n "$SAVE_OWNER" ] || chown $SAVE_OWNER $3
+               [ -n "$SAVE_PERM" ] || chmod $SAVE_PERM $3
        fi
 
        # Generate statistics and send them.
@@ -91,9 +99,9 @@ make_stats() {
 
 
 if [ "$1" = "daily" ]; then
-       make_stats "$DAILY_FILES" "$DAILY_ACTION" $DAILY_SAVE_AS
+       make_stats "$DAILY_FILES" "$DAILY_ACTION" "$DAILY_SAVE_AS"
 elif [ "$1" = "weekly" ]; then
-       make_stats "$WEEKLY_FILES" "$WEEKLY_ACTION" $WEEKLY_SAVE_AS
+       make_stats "$WEEKLY_FILES" "$WEEKLY_ACTION" "$WEEKLY_SAVE_AS"
 else
        echo 'Make up your mind!' >&2
 fi