Changeset 1461

Timestamp:

05/27/04 10:01:13 (9 years ago)

Author:

anonymous

Message:

• Ajout de la dependance a php4-cgi
• Ajout du fic de conf facultatif /etc/alternc/webalizer.conf
• Ajout du script de reinitialisation des templates en mode cgi, lance a

chaque build des stats

Location:

trunk

Files:

• alternc-webalizer (modified) (2 diffs)
• bureau/class/m_stats.php (modified) (1 diff)
• debian/control (modified) (1 diff)
• reset_stats_conf.php (added)
• webalizer.template.conf (added)

trunk/alternc-webalizer

@@ -2 +2 @@
 . /etc/alternc/local.sh
 
-tmp=`mktemp -p /tmp`
+if [ -e /etc/alternc/webalizer.conf ]
+then
+    . /etc/alternc/webalizer.conf
+fi
 
+if [ -z "$ACCESSLOG" ] 
+then
+    ACCESSLOG="/var/log/apache/access.log.1"
+fi
+
+if [ -z "$MYSQL_HOST" ] 
+then
+    MYSQL_HOST="localhost"
+fi
+
+CACHEDIR="/var/cache/alternc-webalizer"
+TMPLOG=`mktemp -p /tmp`
+mkdir -p $CACHEDIR
 trap cleanup 1 2 15
 
 function cleanup {
-    rm -f $tmp
+    rm -f $TMPLOG
+    rm -rf $CACHEDIR/*
 }
 
@@ -15 +32 @@
     do    
         # first run: resolve IPs in cache
-        grep -h " $DOM$" /var/log/apache/access.log{.1,} | tee $tmp | \
+        grep -h " $DOM$" $ACCESSLOG | tee $TMPLOG | \
         /usr/bin/webalizer-$LANG -c /etc/webalizer/$DOM.conf -
         # second run, create the stats
-        /usr/bin/webalizer-$LANG -c /etc/webalizer/$DOM.conf -N 0 $tmp
+        /usr/bin/webalizer-$LANG -c /etc/webalizer/$DOM.conf -N 0 $TMPLOG
         read LANG DOM
     done
 }
 
+# Clear the cache dir
+rm -rf $CACHEDIR/* 
+
 mysql -h"$MYSQL_HOST" -p"$MYSQL_PASS" -u"$MYSQL_USER" "$MYSQL_DATABASE" -B -e "SELECT lang,hostname FROM stats" |grep -v "^lang" | dostat
 

trunk/bureau/class/m_stats.php

@@ -43 +43 @@
    * @access private 
    */
-  var $CONFDIR="/etc/webalizer/";
+  var $CONFDIR="/var/cache/alternc-webalizer/";
 
   /** Emplacement du fichier patron pour recopie.
    * @access private 
    */
-  var $TEMPLATEFILE="/etc/webalizer/template.conf";
+  var $TEMPLATEFILE="/etc/alternc/webalizer.template.conf";
 
   /** Nom des langues disponibles */

trunk/debian/control

@@ -10 +10 @@
 Version: 0.9-1
 Architecture: i386
-Depends: alternc (>=0.9), webalizer-i18n, debconf
+Depends: alternc (>=0.9), webalizer-i18n, debconf, php4-cgi
+Suggests: apachemerge
 Description: Webalizer module for AlternC. 
  AlternC is a hosting software suite based on Valentin