From c1e59f6e9a86cbf3b5e0c242f5f24490ea9a0774 Mon Sep 17 00:00:00 2001 From: Axel ROGER Date: Thu, 30 Aug 2012 12:50:19 +0000 Subject: [PATCH] adding a FOURTH Debian Package : alternc-awstats --- .gitattributes | 24 + awstats/Makefile | 28 + awstats/alternc-awstats | 62 ++ awstats/awstats.cache.php | 14 + awstats/awstats.sql | 28 + awstats/awstats.template.conf | 9 + awstats/awstats_alternc.png | Bin 0 -> 6924 bytes awstats/bureau/admin/aws_add.php | 107 ++++ awstats/bureau/admin/aws_del.php | 51 ++ awstats/bureau/admin/aws_doadd.php | 45 ++ awstats/bureau/admin/aws_doedit.php | 53 ++ awstats/bureau/admin/aws_edit.php | 50 ++ awstats/bureau/admin/aws_list.php | 83 +++ awstats/bureau/admin/aws_pass.php | 79 +++ awstats/bureau/admin/aws_useradd.php | 44 ++ awstats/bureau/admin/aws_userdel.php | 45 ++ awstats/bureau/admin/aws_users.php | 100 ++++ awstats/bureau/admin/menu_aws.php | 40 ++ awstats/bureau/class/m_aws.php | 720 ++++++++++++++++++++++++ awstats/logresolvemerge.pl | 715 +++++++++++++++++++++++ debian/alternc-awstats.dirs | 14 + debian/alternc-awstats.lintian-override | 5 + debian/alternc-awstats.postinst | 124 ++++ debian/alternc-awstats.postrm | 44 ++ debian/alternc-awstats.preinst | 19 + debian/control | 17 + debian/rules | 16 + 27 files changed, 2536 insertions(+) create mode 100755 awstats/Makefile create mode 100755 awstats/alternc-awstats create mode 100755 awstats/awstats.cache.php create mode 100644 awstats/awstats.sql create mode 100644 awstats/awstats.template.conf create mode 100644 awstats/awstats_alternc.png create mode 100644 awstats/bureau/admin/aws_add.php create mode 100644 awstats/bureau/admin/aws_del.php create mode 100644 awstats/bureau/admin/aws_doadd.php create mode 100644 awstats/bureau/admin/aws_doedit.php create mode 100644 awstats/bureau/admin/aws_edit.php create mode 100644 awstats/bureau/admin/aws_list.php create mode 100644 awstats/bureau/admin/aws_pass.php create mode 100644 awstats/bureau/admin/aws_useradd.php create mode 100644 awstats/bureau/admin/aws_userdel.php create mode 100644 awstats/bureau/admin/aws_users.php create mode 100644 awstats/bureau/admin/menu_aws.php create mode 100644 awstats/bureau/class/m_aws.php create mode 100755 awstats/logresolvemerge.pl create mode 100644 debian/alternc-awstats.dirs create mode 100644 debian/alternc-awstats.lintian-override create mode 100755 debian/alternc-awstats.postinst create mode 100755 debian/alternc-awstats.postrm create mode 100755 debian/alternc-awstats.preinst diff --git a/.gitattributes b/.gitattributes index ad537a53..15f6bf24 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,6 +13,25 @@ aide/index.sgml -text aide/sommaire.sgml -text aide/stats.sgml -text aide/test.sgml -text +awstats/Makefile -text +awstats/alternc-awstats -text +awstats/awstats.cache.php -text +awstats/awstats.sql -text +awstats/awstats.template.conf -text +awstats/awstats_alternc.png -text +awstats/bureau/admin/aws_add.php -text +awstats/bureau/admin/aws_del.php -text +awstats/bureau/admin/aws_doadd.php -text +awstats/bureau/admin/aws_doedit.php -text +awstats/bureau/admin/aws_edit.php -text +awstats/bureau/admin/aws_list.php -text +awstats/bureau/admin/aws_pass.php -text +awstats/bureau/admin/aws_useradd.php -text +awstats/bureau/admin/aws_userdel.php -text +awstats/bureau/admin/aws_users.php -text +awstats/bureau/admin/menu_aws.php -text +awstats/bureau/class/m_aws.php -text +awstats/logresolvemerge.pl -text bureau/admin/about.php -text bureau/admin/adm_add.php -text bureau/admin/adm_authip_whitelist.php -text @@ -372,6 +391,11 @@ bureau/locales/pt_BR/LC_MESSAGES/messages.po -text debian/.svnignore -text debian/NEWS -text debian/README.Debian -text +debian/alternc-awstats.dirs -text +debian/alternc-awstats.lintian-override -text +debian/alternc-awstats.postinst -text +debian/alternc-awstats.postrm -text +debian/alternc-awstats.preinst -text debian/alternc-slave.config -text debian/alternc-slave.dirs -text debian/alternc-slave.install -text diff --git a/awstats/Makefile b/awstats/Makefile new file mode 100755 index 00000000..8d69bcb8 --- /dev/null +++ b/awstats/Makefile @@ -0,0 +1,28 @@ +# ---------------------------------------------------------------------- +# LICENSE +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License (GPL) +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# To read the license please visit http://www.gnu.org/copyleft/gpl.html +# ---------------------------------------------------------------------- +# Purpose of file: Install the files of alternc-awstats packages +# ---------------------------------------------------------------------- + +install: + install -m 0644 -g root -o root alterncawstats.conf $(DESTDIR)/etc/alternc/ + install -m 0755 -g root -o root logresolvemerge.pl $(DESTDIR)/usr/lib/alternc/ + install -m 0644 -g www-data -o www-data awstats_alternc.png $(DESTDIR)/usr/share/awstats/icon/other/ + install -m 0755 -g www-data -o www-data alternc-awstats $(DESTDIR)/usr/lib/alternc/ + install -m 0755 -g www-data -o www-data awstats.cache.php $(DESTDIR)/usr/lib/alternc/ + install -m 0644 awstats.sql $(DESTDIR)/usr/share/alternc/ + install -m 0644 -g www-data -o www-data awstats.template.conf $(DESTDIR)/etc/alternc/templates/awstats/ + install -m 0644 -g www-data -o www-data awstats.alternc.generic.conf $(DESTDIR)/etc/alternc/ + #install -m 0444 lintian-override $(DESTDIR)/usr/share/lintian/overrides/alternc-awstats diff --git a/awstats/alternc-awstats b/awstats/alternc-awstats new file mode 100755 index 00000000..2b1a54d2 --- /dev/null +++ b/awstats/alternc-awstats @@ -0,0 +1,62 @@ +#!/bin/bash + +# Appelé seul, lance les stats AWStats du jour. +# Appelé avec "all" lance les stats avec tous les fichiers .gz situés dans /var/log/apache +# Appelé avec un nom de domaine en paramètre, rescanne tous les fichiers .gz pour ce domaine uniquement. + +# Include some usefull functions +. /usr/lib/alternc/functions.sh + +# Regenerate the awstat etc cache files : +if [ -x ./awstats.cache.php ] +then + ./awstats.cache.php +fi + +# FIXME : set this var in local.sh +LOG_DIR="/var/alternc/logs" + +CACHEDIR="/var/cache/awstats" # Dans la sarge par defaut les données awstats sont stockées dans /var/lib/awstats ... +mkdir -p $CACHEDIR + +function searchdomain { + U_ID=$(mysql_query "SELECT uid FROM aws WHERE hostname='$1'" | grep -v "^uid") + U_LOGIN=$(mysql_query "SELECT login FROM membres WHERE uid='$U_ID'" |grep -v "^login") + DOM_DIR="$LOG_DIR/$U_ID-$U_LOGIN" + echo $(find -P "$DOM_DIR" -mindepth 1 -maxdepth 2 -type f -iname "*.log" -print0 | xargs -0) +} + +function dostatgz { + read DOM + while [ "$DOM" ] + do + LOGAPACHE=$(searchdomain $DOM) + echo "processing $DOM (for access files in $LOGAPACHE )" + /usr/lib/cgi-bin/awstats.pl -config=$DOM -update -LogFile="/usr/lib/alternc/logresolvemerge.pl $LOGAPACHE* |" + read DOM + done +} + +function dostat { + read DOM + while [ "$DOM" ] + do + echo "processing $DOM" + LOGAPACHE=$(searchdomain $DOM) + /usr/lib/cgi-bin/awstats.pl -config=$DOM -LogFile="/usr/lib/alternc/logresolvemerge.pl $LOGAPACHE | " + read DOM + done +} + +if [ -z "$1" ] + then + mysql_query "SELECT hostname FROM aws" |grep -v "^hostname" | dostat +else + if [ "$1" = "all" ] + then + mysql_query "SELECT hostname FROM aws" |grep -v "^hostname" | dostatgz + else + echo "$1" | dostatgz + fi +fi + diff --git a/awstats/awstats.cache.php b/awstats/awstats.cache.php new file mode 100755 index 00000000..33c29ef7 --- /dev/null +++ b/awstats/awstats.cache.php @@ -0,0 +1,14 @@ +#!/usr/bin/php -q +query("SELECT id,hostname FROM aws;"); +while ($db->next_record()) { + $d[]=$db->Record; +} +foreach ($d as $r) { + $aws->_createconf($r[0],1); +} + +?> \ No newline at end of file diff --git a/awstats/awstats.sql b/awstats/awstats.sql new file mode 100644 index 00000000..d0960021 --- /dev/null +++ b/awstats/awstats.sql @@ -0,0 +1,28 @@ +# -------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `aws` ( + `id` int(10) unsigned NOT NULL auto_increment, + `uid` int(10) unsigned NOT NULL default '0', + `hostname` varchar(255) NOT NULL default '', + PRIMARY KEY (`id`) +) TYPE=MyISAM COMMENT='Statistiques web par Awstats'; + + +# -------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `aws_users` ( + `uid` int(10) unsigned NOT NULL, + `login` varchar(128) NOT NULL, + `pass` varchar(38) NOT NULL, + PRIMARY KEY (`login`), + INDEX (`uid`) +) COMMENT = 'Comptes pouvant accéder aux stats awstats.'; + +# -------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `aws_access` ( +`id` int(10) unsigned NOT NULL, +`uid` int(10) unsigned NOT NULL, +`login` varchar(128) NOT NULL, +INDEX (`id`) +) COMMENT = 'Qui peut accéder aux stats awstats '; + + ALTER TABLE `aws` ADD `public` INT(1) unsigned NOT NULL DEFAULT '1'; + ALTER TABLE `aws` ADD `hostaliases` TEXT ; diff --git a/awstats/awstats.template.conf b/awstats/awstats.template.conf new file mode 100644 index 00000000..5d424302 --- /dev/null +++ b/awstats/awstats.template.conf @@ -0,0 +1,9 @@ +Include "/etc/alternc/awstats.alternc.generic.conf" +Include "/etc/awstats/awstats.conf.local" +Include "/etc/alternc/awstats.log.alternc.conf" +SiteDomain="%%HOSTNAME%%" +HostAliases="%%HOSTALIASES%%" +DirData="/var/cache/awstats/%%HOSTNAME%%" +AllowAccessFromWebToFollowingAuthenticatedUsers="admin %%USERS%%" +AllowAccessFromWebToAuthenticatedUsersOnly=%%PUBLIC%% +AllowFullYearView=3 diff --git a/awstats/awstats_alternc.png b/awstats/awstats_alternc.png new file mode 100644 index 0000000000000000000000000000000000000000..7e4bb233c175201d4be3eb75b466025c3e40d913 GIT binary patch literal 6924 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 S^8%0n0000 array ("request", "integer", 0), +); +getFields($fields); + +if (!$id && !$quota->cancreate("aws")) { + $error=_("You cannot add any new statistics, your quota is over."); +} + +include_once("head.php"); +?> +

+
+
+$error

"; + } +?> +
" id="main" name="main"> + + + + + + +
+ + + + + + +
+host_list(); +$hatab=$aws->get_hostaliases($id); +foreach ($hl as $ho) { + echo "
\n"; +} +?> +
+list_allowed_login($id); + +if (is_array($r)) { +?> +
\n"; +} +?> +
+ +
+ " /> + " onclick="document.location='aws_list.php'"/> + +
+
+ diff --git a/awstats/bureau/admin/aws_del.php b/awstats/bureau/admin/aws_del.php new file mode 100644 index 00000000..3b7e5655 --- /dev/null +++ b/awstats/bureau/admin/aws_del.php @@ -0,0 +1,51 @@ +delete_stats($val); + $found=true; + if (!$r) { + $error.=$err->errstr()."
"; + } else { + $error.=sprintf(_("The statistics %s has been successfully deleted"),$r)."
"; + } + } +} + +if (!$found) { + $error.=_("Please check the statistics set you want to delete"); + } + +include("aws_list.php"); +exit(); + +?> diff --git a/awstats/bureau/admin/aws_doadd.php b/awstats/bureau/admin/aws_doadd.php new file mode 100644 index 00000000..d347a90d --- /dev/null +++ b/awstats/bureau/admin/aws_doadd.php @@ -0,0 +1,45 @@ + array ("post", "string", ""), + "awsusers" => array ("post", "array", ""), + "hostaliases" => array ("post", "array", ""), + "public" => array ("post", "integer", "") +); +getFields($fields); + +$r=$aws->add_stats($hostname,$awsusers,$hostaliases,$public); +if (!$r) { + $error=$err->errstr(); + include("aws_add.php"); + exit(); +} else { + $error=_("The statistics has been successfully created"); + include("aws_list.php"); + exit(); +} +?> diff --git a/awstats/bureau/admin/aws_doedit.php b/awstats/bureau/admin/aws_doedit.php new file mode 100644 index 00000000..67b5bcfe --- /dev/null +++ b/awstats/bureau/admin/aws_doedit.php @@ -0,0 +1,53 @@ + array ("request", "integer", 0), + "awsusers" => array ("post", "array", ""), + "hostaliases" => array ("post", "array", ""), + "public" => array ("post", "integer", "") +); +getFields($fields); + +if (!$id) { + $error=_("No Statistics selected!"); +} else { + $ha =""; + foreach($hostaliases as $ho) + $ha .= "$ho "; + + $r=$aws->put_stats_details($id,$awsusers,$ha,$public); + if (!$r) { + $error=$err->errstr(); + include("aws_edit.php"); + exit(); + } else { + $error=_("The Statistics has been successfully changed"); + include("aws_list.php"); + exit(); + } +} +?> diff --git a/awstats/bureau/admin/aws_edit.php b/awstats/bureau/admin/aws_edit.php new file mode 100644 index 00000000..70a72a19 --- /dev/null +++ b/awstats/bureau/admin/aws_edit.php @@ -0,0 +1,50 @@ + array ("request", "integer", 0), +); +getFields($fields); + +if (!$id) { + $error=_("No Statistics selected!"); +} else { + $r=$aws->get_stats_details($id); + if (!$r) { + $error=$err->errstr(); + } +} + +$id=$r["id"]; +$hostname=$r["hostname"]; +$awsusers=$r["users"]; +$hostaliases=$r["hostaliases"]; +$public=$r["public"]; + +include("aws_add.php"); +exit(); + +?> diff --git a/awstats/bureau/admin/aws_list.php b/awstats/bureau/admin/aws_list.php new file mode 100644 index 00000000..d168ceec --- /dev/null +++ b/awstats/bureau/admin/aws_list.php @@ -0,0 +1,83 @@ +get_list()) { + $error=$err->errstr(); + $nosta=true; +} + +?> +

+
+
+

+

+cancreate("aws")) { ?> +
+ +

+$error

"; + } + +if (!$nosta) { +?> + +
+ + + + + + + + + + + + + +
" name="del_" value="" />
"><?php __(" title="" />
<?php __(" />">
" />
+
+ + diff --git a/awstats/bureau/admin/aws_pass.php b/awstats/bureau/admin/aws_pass.php new file mode 100644 index 00000000..c360e83c --- /dev/null +++ b/awstats/bureau/admin/aws_pass.php @@ -0,0 +1,79 @@ + array ("request", "string", ""), + "pass" => array ("request", "string", ""), +); + +getFields($fields); + +if (!$aws->login_exists($login)) { + $error=$err->errstr(); + include("aws_users.php"); + exit(); +} + +if ($pass) { + if (!$aws->change_pass($login,$pass)) { + $error=$err->errstr(); + } else { + include("aws_users.php"); + exit(); + } +} + +include_once("head.php"); + +?> +

+ +

+ + +
+ + + + +
+ + +
+ " /> + " onclick="document.location='aws_users.php'"/> +
+
+ + + + + diff --git a/awstats/bureau/admin/aws_useradd.php b/awstats/bureau/admin/aws_useradd.php new file mode 100644 index 00000000..5ad0c385 --- /dev/null +++ b/awstats/bureau/admin/aws_useradd.php @@ -0,0 +1,44 @@ + array ("request", "string", ""), + "login" => array ("request", "string", ""), + "pass" => array ("request", "string", ""), +); +getFields($fields); + +$r=$aws->add_login($prefixe.(($login)?"_":"").$login,$pass); +if (!$r) { + $error=$err->errstr(); +} else { + $error=_("The Awstat account has been successfully created"); +} + +include("aws_users.php"); +exit(); + +?> diff --git a/awstats/bureau/admin/aws_userdel.php b/awstats/bureau/admin/aws_userdel.php new file mode 100644 index 00000000..5efd07f5 --- /dev/null +++ b/awstats/bureau/admin/aws_userdel.php @@ -0,0 +1,45 @@ +del_login($val); + if (!$r) { + $error.=$err->errstr()."
"; + } else { + $error.=sprintf(_("The awstat account %s has been successfully deleted"),$val)."
"; + } + } +} + +include("aws_users.php"); +exit(); + +?> diff --git a/awstats/bureau/admin/aws_users.php b/awstats/bureau/admin/aws_users.php new file mode 100644 index 00000000..9c0a9ef5 --- /dev/null +++ b/awstats/bureau/admin/aws_users.php @@ -0,0 +1,100 @@ +list_login()) { + $nologin=true; + $error=$err->errstr(); +} + +?> +

+
+
+ +cancreate("aws")) { ?> +

+ + +
+ + + + +
+ +  _  +
+ " /> + " onclick="document.location='aws_list.php'"/> + +
+
+
+ +

+ + + +
+ + + + + + + + + + +
" />
+
+ + + + + + diff --git a/awstats/bureau/admin/menu_aws.php b/awstats/bureau/admin/menu_aws.php new file mode 100644 index 00000000..d096ea48 --- /dev/null +++ b/awstats/bureau/admin/menu_aws.php @@ -0,0 +1,40 @@ +getquota("aws"); +$r = $quota->getquota("dom"); +if (isset($q["t"]) && isset($r["u"]) && $q["t"] > 0 && $r["u"] > 0) { + +?> +
+
<?php __(" />  (/)
+
+ diff --git a/awstats/bureau/class/m_aws.php b/awstats/bureau/class/m_aws.php new file mode 100644 index 00000000..c5892ffc --- /dev/null +++ b/awstats/bureau/class/m_aws.php @@ -0,0 +1,720 @@ +"Awstats Web Statistics"); + } + + + /* ----------------------------------------------------------------- */ + /** + * Name of the module function + */ + function alternc_module_description() { + return array("aws"=>_("The stats module allows any user to ask for statistics about his web site. Statistics are web pages generated daily based on the visits of the day before. Awstats is the soft used to produce those stats. The statistics are then protected by a login and a password.")); + } + + + /* ----------------------------------------------------------------- */ + /** + * Returns an array with all the statistics of a member. + * + * @return array Returns an indexed array of associative arrays + * like that : + * $r[0-n]["id"] = Id of the stat set + * $r[0-n]["hostname"]= domain + * $r[0-n]["users"]= list of allowed users separated with ' ' + */ + function get_list() { + global $db,$err,$cuid; + $err->log("aws","get_list"); + $r=array(); + $db->query("SELECT id, hostname FROM aws WHERE uid='$cuid' ORDER BY hostname;"); + if ($db->num_rows()) { + while ($db->next_record()) { + $r[]=array( + "id"=>$db->f("id"), + "hostname"=>$db->f("hostname"), + ); + } + $t=array(); + foreach ($r as $v) { + $db->query("SELECT login FROM aws_access WHERE id='".$v["id"]."';"); + $u=""; + while ($db->next_record()) { + $u.=$db->f("login")." "; + } + $t[]=array("id"=>$v["id"],"hostname"=>$v["hostname"],"users"=>$u); + } + return $t; + } else { + $err->raise("aws",1); // No statistics currently defined + return false; + } + } + + + /* ----------------------------------------------------------------- */ + /** + * Return an array with the details for 1 statistic set + * + * @param integer $id ID of the set we want. + * @return array Returns an associative array as follow : + * $r["id"] = Id + * $r["hostname"]= domain + * $r["users"] = List of allowed users, separated by ' ' + */ + function get_stats_details($id) { + global $db,$err,$cuid; + $err->log("aws","get_stats_details",$id); + $r=array(); + $db->query("SELECT id, hostname, hostaliases, public FROM aws WHERE uid='$cuid' AND id='$id';"); + if ($db->num_rows()) { + $db->next_record(); + $id=$db->f("id"); + $hostname=$db->f("hostname"); + $hostaliases=$db->f("hostaliases"); + $public=$db->f("public"); + $db->query("SELECT login FROM aws_access WHERE id='$id';"); + $u=""; + while ($db->next_record()) { + $u.=$db->f("login")." "; + } + return array( + "id"=>$id, + "hostname"=>$hostname, + "users"=>$u, + "hostaliases"=>$hostaliases, + "public"=>$public + ); + } else { + $err->raise("aws",2); // This statistic does not exist + return false; + } + } + + + /* ----------------------------------------------------------------- */ + /** Return the list of domains / subdomains allowed for this member + * + * @return array an array of allowed domains / subdomains. + */ + function host_list() { + global $db,$err,$cuid; + $r=array(); + $db->query("SELECT domaine,sub FROM sub_domaines WHERE compte='$cuid' ORDER BY domaine,sub;"); + while ($db->next_record()) { + if ($db->f("sub")) { + $r[]=$db->f("sub").".".$db->f("domaine"); + } else { + $r[]=$db->f("domaine"); + } + } + return $r; + } + + + /* ----------------------------------------------------------------- */ + /** Returns the list of prefixes that can be used on current account + * @return array an arry with the list of domains + the login of the account + */ + function prefix_list() { + global $db,$mem,$cuid; + $r=array(); + $r[]=$mem->user["login"]; + $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' ORDER BY domaine;"); + while ($db->next_record()) { + $r[]=$db->f("domaine"); + } + return $r; + } + + + /* ----------------------------------------------------------------- */ + /** Echoes "; + } + return true; + } + + + /* ----------------------------------------------------------------- */ + /** + * Draw options for a select html code with the list of allowed domains + * for this member. + */ + function select_host_list($current) { + $r=$this->host_list(); + reset($r); + while (list($key,$val)=each($r)) { + if ($current==$val) $c=" selected=\"selected\""; else $c=""; + echo "$val"; + } + return true; + } + + + /* ----------------------------------------------------------------- */ + /** + * Return the hostaliases list with an id. + */ + function get_hostaliases($id) { + global $db,$err,$cuid; + $r=array(); + if ($id == NULL) + return $r; + $db->query("SELECT hostaliases FROM aws WHERE uid='$cuid' and id='$id' ORDER by hostaliases;"); + while ($db->next_record()) { + $r[]=$db->f("hostaliases"); + } + + return $r; + } + + + /* ----------------------------------------------------------------- */ + /** + * Edit a statistic set (change allowed user list) + * @param integer $id the stat number we change + * @param array $users the list of allowed users + */ + function put_stats_details($id,$users,$hostaliases,$public) { + global $err,$db,$cuid; + if ($c=$this->get_stats_details($id)) { + $this->delete_allowed_login($id, 1); + if (is_array($users)) { + foreach($users as $v) { + $this->allow_login($v,$id,1); + } + } + $db->query("UPDATE aws SET hostaliases='$hostaliases', public='$public' where id='$id';"); + $this->_createconf($id); + $this->_createhtpasswd(); + return true; + } else return false; + } + + + /* ----------------------------------------------------------------- */ + /** + * Delete a statistic set. + * @param integer $id The statistic set ID + * @return string the domain name of the deleted statistic set, or FALSE if an error occurred + */ + function delete_stats($id) { + global $db,$err,$cuid; + $err->log("aws","delete_stats",$id); + $db->query("SELECT hostname FROM aws WHERE id='$id' and uid='$cuid';"); + if (!$db->num_rows()) { + $err->raise("aws",2); // This statistic does not exist + return false; + } + $db->next_record(); + $hostname=$db->f("hostname"); + $this->delete_allowed_login($id,1); + $this->_delconf($hostname); + $db->query("DELETE FROM aws WHERE id='$id'"); + system("rm ".$this->CACHEDIR."/$hostname/ -rf"); + return $name; + } + + + /* ----------------------------------------------------------------- */ + /** + * Create a new statistic set + * @param string $hostname The domain name + * @param $uers array the array of users that will be allowed + * @param $hostaliases array an array of host aliases + * @param $public boolean Shall this statistic set be public ? + * @return boolean TRUE if the set has been created + */ + function add_stats($hostname,$users="", $hostaliases,$public) { + global $db,$err,$quota,$mem,$cuid; + $err->log("aws","add_stats",$hostname); + $r=$this->host_list(); + if (!in_array($hostname,$r) || $hostname=="") { + $err->raise("aws",3); // This hostname does not exist + return false; + } + // Parse the hostaliases array (it should contains valid domains) + if (is_array($hostaliases)) { + foreach($hostaliases as $ho) { + if (!in_array($hostname,$r) || $hostname=="") { + $err->raise("aws",3); // This hostname does not exist + return false; + } + $ha .= "$ho "; + } + } + + if ($quota->cancreate("aws")) { + $db->query("INSERT INTO aws (hostname,uid,hostaliases,public) VALUES ('$hostname','$cuid','$ha','$public')"); + $id=$db->lastid(); + if (is_array($users)) { + foreach($users as $v) { + $this->allow_login($v,$id, 1); + } + } + $this->_createconf($id); + $this->_createhtpasswd(); + mkdir($this->CACHEDIR."/".$hostname,0777); + return true; + } else { + $err->raise("aws",4); // Your stat quota is over... + return false; + } + } + + + /* ----------------------------------------------------------------- */ + function list_login() { + global $db,$err,$cuid; + $err->log("aws","list_login"); + $db->query("SELECT login FROM aws_users WHERE uid='$cuid';"); + $res=array(); + if (!$db->next_record()) { + $err->raise("aws",13); // No user currently defined + return false; + } + do { + $res[]=$db->f("login"); + } while ($db->next_record()); + return $res; + } + + + /* ----------------------------------------------------------------- */ + function list_allowed_login($id) { + global $db,$err,$cuid; + $err->log("aws","list_allowed_login"); + $db->query("SELECT u.login,a.id FROM aws_users u LEFT JOIN aws_access a ON a.id='$id' AND a.login=u.login WHERE u.uid='$cuid';"); + $res=array(); + if (!$db->next_record()) { + return false; + } + do { + $res[]=array("login"=>$db->f("login"),"selected"=>($db->f("id"))); + } while ($db->next_record()); + return $res; + } + + /* ----------------------------------------------------------------- */ + function get_view_public($id) { + global $db,$err,$cuid; + $db->query("SELECT public FROM aws WHERE id='$id' and uid='$cuid';"); + if ($db->num_rows()) { + $db->next_record(); + $pub=$db->f("public"); + } else { + $pub=1; + } + return $pub; + } + + + /* ----------------------------------------------------------------- */ + /* Check that a login exists ($exists=1) or doesn't exist ($exists=0) */ + function login_exists($login,$exists=1) { + global $db,$err,$cuid; + $err->log("aws","list_login"); + $db->query("SELECT login FROM aws_users WHERE uid='$cuid' AND login='$login';"); + if (!$db->next_record()) { + return ($exists==0); + } else { + return ($exists==1); + } + } + + + /* ----------------------------------------------------------------- */ + function del_login($login) { + global $db,$err,$cuid; + $err->log("aws","del_login"); + if (!$this->login_exists($login,1)) { + $err->raise("aws",5); // Login does not exists + return false; + } + $db->query("DELETE FROM aws_users WHERE uid='$cuid' AND login='$login';"); + $db->query("DELETE FROM aws_access WHERE uid='$cuid' AND login='$login';"); + $this->_createhtpasswd(); + return true; + } + + + /* ----------------------------------------------------------------- */ + function add_login($login,$pass) { + global $db,$err,$cuid; + $err->log("aws","add_login"); + + if (!($login=$this->_check($login))) { + $err->raise("aws",6); // Login incorrect + return false; + } + if (!($this->login_exists($login,0))) { + $err->raise("aws",7); // Login does not exist + return false; + } + $pass=crypt($pass); + $db->query("INSERT INTO aws_users (uid,login,pass) VALUES ('$cuid','$login','$pass');"); + $this->_createhtpasswd(); + return true; + } + + + /* ----------------------------------------------------------------- */ + function change_pass($login,$pass) { + global $db,$err,$cuid; + $err->log("aws","change_pass"); + + if (!($login=$this->_check($login))) { + $err->raise("aws",6); // Login incorrect + return false; + } + if (!($this->login_exists($login))) { + $err->raise("aws",5); // Login does not exists + return false; + } + $pass=crypt($pass); + $db->query("UPDATE aws_users SET pass='$pass' WHERE login='$login';"); + $this->_createhtpasswd(); + return true; + } + + + /* ----------------------------------------------------------------- */ + function allow_login($login,$id,$noconf=0) { // allow user $login to access stats $id. + global $db,$err,$cuid; + $err->log("aws","allow_login"); + + if (!($login=$this->_check($login))) { + $err->raise("aws",6); // Login incorrect + return false; + } + if (!$this->login_exists($login)) { + $err->raise("aws",5); // Login does not exists + return false; + } + $db->query("SELECT id FROM aws WHERE id='$id' AND uid='$cuid'"); + if (!$db->next_record()) { + $err->raise("aws",2); // The requested statistic does not exist. + return false; + } + $db->query("SELECT login FROM aws_access WHERE id='$id' AND login='$login'"); + if ($db->next_record()) { + $err->raise("aws",8); // This login is already allowed for this statistics. + return false; + } + $db->query("INSERT INTO aws_access (uid,id,login) VALUES ('$cuid','$id','$login');"); + if (!$noconf) { + $this->_createconf($id); + $this->_createhtpasswd(); + } + return true; + } + + + /* ----------------------------------------------------------------- */ + function delete_allowed_login($id,$noconf=0) { + global $db,$err,$cuid; + $err->log("aws","delete_allowed_login"); + + $db->query("SELECT id FROM aws WHERE id='$id' AND uid='$cuid'"); + if (!$db->next_record()) { + $err->raise("aws",2); // The requested statistic does not exist. + return false; + } + $db->query("DELETE FROM aws_access WHERE id='$id';"); + if (!$noconf) { + $this->_createconf($id); + $this->_createhtpasswd(); + } + return true; + } + + + /* ----------------------------------------------------------------- */ + function deny_login($login,$id,$noconf=0) { // deny user $login to access stats $id. + global $db,$err,$cuid; + $err->log("aws","deny_login"); + + if (!($login=$this->_check($login))) { + $err->raise("aws",6); // Login incorrect + return false; + } + if (!$this->login_exists($login,0)) { + $err->raise("aws",5); // Login does not exists + return false; + } + $db->query("SELECT id FROM aws WHERE id='$id' AND uid='$cuid'"); + if (!$db->next_record()) { + $err->raise("aws",2); // The requested statistic does not exist. + return false; + } + $db->query("SELECT login FROM aws_access WHERE id='$id' AND login='$login'"); + if (!$db->next_record()) { + $err->raise("aws",9); // This login is already denied for this statistics. + return false; + } + $db->query("DELETE FROM aws_access WHERE id='$id' AND login='$login';"); + if (!$noconf) { + $this->_createconf($id); + $this->_createhtpasswd(); + } + return true; + } + + + /* ----------------------------------------------------------------- */ + function alternc_del_member() { + global $db,$err,$cuid; + $err->log("aws","del_member"); + $db->query("SELECT * FROM aws WHERE uid='$cuid';"); + $t=array(); + while ($db->next_record()) { + $t[]=$db->f("hostname"); + } + $db->query("DELETE FROM aws WHERE uid='$cuid';"); + foreach ($t as $i) { + $this->_delconf($i); + } + $this->_createhtpasswd(); + $db->query("DELETE FROM aws_access WHERE uid='$cuid'"); + $db->query("DELETE FROM aws_users WHERE uid='$cuid';"); + return true; + } + + + /* ----------------------------------------------------------------- */ + /** + * This function is called on each class when a domain name is uninstalled + * @param string $dom the domain to uninstall + */ + function alternc_del_domain($dom) { + global $db,$err,$cuid; + $err->log("aws","alternc_del_domain",$dom); + $db=new DB_System(); + $db->query("SELECT id,hostname FROM aws WHERE uid='$cuid' AND (hostname='$dom' OR hostname like '%.$dom')"); + $t=array(); + while ($db->next_record()) { + $t[]=array($db->f("hostname"),$db->f("id")); + } + foreach ($t as $i) { + $db->query("DELETE FROM aws WHERE uid='$cuid' AND hostname='".$i[0]."';"); + $db->query("DELETE FROM aws_access WHERE uid='$cuid' AND id='".$i[1]."';"); + $this->_delconf($i[0]); + } + $this->_createhtpasswd(); + return true; + } + + + /* ----------------------------------------------------------------- */ + /** + * This function is called when we are asked to compute the used quota + * for a service + * @param integer $id The userid whose quota should be computed. + */ + function hook_quota_get() { + global $db,$err,$cuid; + $err->log("aws","get_quota"); + $db->query("SELECT COUNT(*) AS cnt FROM aws WHERE uid='$cuid'"); + $q=Array("name"=>"aws", "description"=>_("Awstats"), "used"=>0); + if ($db->next_record()) { + $q['used']=$db->f("cnt"); + } + return $q; + } + + + /* ----------------------------------------------------------------- */ + function _check($login) { + global $err,$mem; + $login=trim($login); + $login=strtolower($login); + if ($c=strpos($login,"_")) { + $prefix=substr($login,0,$c); + $postfix=substr($login,$c+1); + } else { + $prefix=$login; + $postfix=""; + } + $r=$this->prefix_list(); + if (!in_array($prefix,$r)) { + $err->raise("aws",10); // prefix not allowed. + return false; + } + if (!preg_match('/^[0-9a-z_-]*$/', $postfix)){ + $err->raise("aws",11); // Forbidden caracters in the postfix. + return false; + } + return $login; + } + + + /* ----------------------------------------------------------------- */ + /** Delete the awstats configuration file for a statistic set. + * @access private + */ + function _delconf($hostname) { + global $err; + if (!preg_match('/^[._a-z0-9-]*$/', $hostname)){ + $err->raise("aws",12); // Hostname is incorrect + return false; + } + @unlink($this->CONFDIR."/awstats.".$hostname.".conf"); + } + + + /* ----------------------------------------------------------------- */ + /** Create a configuration file for a statistic set. + * if nochk==1, does not check the owner of the stat set (for admin only) + * @access private + */ + function _createconf($id,$nochk=0) { + global $db,$err,$cuid; + $s=implode("",file($this->TEMPLATEFILE)); + if ($nochk) { + $db->query("SELECT * FROM aws WHERE id='$id';"); + } else { + $db->query("SELECT * FROM aws WHERE id='$id' AND uid='$cuid';"); + } + if (!$db->num_rows()) { + $err->raise("aws",2); // This statistic does not exist + return false; + } + $db->next_record(); + $hostname=$db->f("hostname"); + $hostaliases=$db->f("hostaliases"); + $public=$db->f("public"); + $db->query("SELECT login FROM aws_access WHERE id='$id';"); + $users=""; + while ($db->next_record()) { + $users.=$db->f("login")." "; + } + $s=str_replace("%%HOSTNAME%%",$hostname,$s); + $s=str_replace("%%PUBLIC%%",$public,$s); + $s=str_replace("%%HOSTALIASES%%",$hostaliases,$s); + $s=str_replace("%%USERS%%",$users,$s); + $f=fopen($this->CONFDIR."/awstats.".$hostname.".conf","wb"); + fputs($f,$s,strlen($s)); + fclose($f); + } + + + /* ----------------------------------------------------------------- */ + function _createhtpasswd() { + global $db; + $f=fopen($this->HTAFILE,"wb"); + if ($f) { + $db->query("SELECT login,pass FROM aws_users;"); + while ($db->next_record()) { + fputs($f,$db->f("login").":".$db->f("pass")."\n"); + } + fclose($f); + } + } + + + /* ----------------------------------------------------------------- */ + /** + * Exports all the aws related information for an account. + * @access private + * EXPERIMENTAL 'sid' function ;) + */ + function alternc_export() { + global $db,$err,$cuid; + $err->log("aws","export"); + $str="\n"; + $db->query("SELECT login,pass FROM aws_users WHERE uid='$cuid';"); + while ($db->next_record()) { + $str.=" ".$db->Record["login"]."".$db->Record["pass"]."\n"; + } + $r=array(); + $db->query("SELECT id, hostname FROM aws WHERE uid='$cuid' ORDER BY hostname;"); + while ($db->next_record()) { + $r[$db->Record["id"]]=$db->Record["hostname"]; + } + foreach($r as $id=>$host) { + $str.=" \n ".$host."\n"; + $db->query("SELECT login FROM aws_access WHERE id='$id';"); + while ($db->next_record()) { + $str.=" ".$db->Record["login"]."\n"; + } + $str.=" \n"; + } + $str.="\n"; + return $str; + } + +} /* CLASSE m_aws */ + +?> diff --git a/awstats/logresolvemerge.pl b/awstats/logresolvemerge.pl new file mode 100755 index 00000000..dcdbf9a2 --- /dev/null +++ b/awstats/logresolvemerge.pl @@ -0,0 +1,715 @@ +#!/usr/bin/perl +#----------------------------------------------------------------------------- +# Allows you to get one unique output log file, sorted on date, +# built from particular sources. +# This tool is part of AWStats log analyzer but can be use +# alone for any other log analyzer. +# See COPYING.TXT file about AWStats GNU General Public License. +#----------------------------------------------------------------------------- +# $Revision: 1.34 $ - $Author: eldy $ - $Date: 2005/12/04 21:10:46 $ + +use strict; no strict "refs"; +#use diagnostics; + +#----------------------------------------------------------------------------- +# Defines +#----------------------------------------------------------------------------- + +# ENABLETHREAD --> COMMENT THIS BLOCK TO USE A THREADED VERSION +my $UseThread=0; +&Check_Thread_Use(); +my $NbOfDNSLookupAsked = 0; +my %threadarray = (); +my %MyDNSTable = (); +my %TmpDNSLookup = (); + +# ENABLETHREAD --> UNCOMMENT THIS BLOCK TO USE A THREADED VERSION +#my $UseThread=1; +#&Check_Thread_Use(); +#my $NbOfDNSLookupAsked : shared = 0; +#my %threadarray : shared = (); +#my %MyDNSTable : shared = (); +#my %TmpDNSLookup : shared = (); + + +# ---------- Init variables -------- +use vars qw/ $REVISION $VERSION /; +$REVISION='$Revision: 1.34 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$VERSION="1.2 (build $REVISION)"; + +use vars qw/ $NBOFLINESFORBENCHMARK /; +$NBOFLINESFORBENCHMARK=8192; + +use vars qw/ +$DIR $PROG $Extension +$Debug $ShowSteps $AddFileNum $AddFileName +$MaxNbOfThread $DNSLookup $DNSCache $DirCgi $DirData $DNSLookupAlreadyDone +$NbOfLinesShowsteps $AFINET $QueueCursor +/; +$DIR=''; +$PROG=''; +$Extension=''; +$Debug=0; +$ShowSteps=0; +$AddFileNum=0; +$AddFileName=0; +$MaxNbOfThread=0; +$DNSLookup=0; +$DNSCache=''; +$DirCgi=''; +$DirData=''; +$DNSLookupAlreadyDone=0; +$NbOfLinesShowsteps=0; +$AFINET=''; + +# ---------- Init arrays -------- +use vars qw/ +@SkipDNSLookupFor +@ParamFile +/; +# ---------- Init hash arrays -------- +use vars qw/ +%LogFileToDo %linerecord %timerecord %corrupted +%QueueHostsToResolve %QueueRecords +/; +%LogFileToDo = %linerecord = %timerecord = %corrupted = (); +%QueueHostsToResolve = %QueueRecords = (); + +# DRA2: the order of timerecords are kept here, each index in the array is the filerecordnumber, which +# DRA2: is used as the key for the other hashes +use vars qw/ +@timerecordorder +/; +@timerecordorder = (); + +# ---------- External Program variables ---------- +# For gzip compression +my $zcat = 'zcat'; +my $zcat_file = '\.gz$'; +# For bz2 compression +my $bzcat = 'bzcat'; +my $bzcat_file = '\.bz2$'; + + + +#----------------------------------------------------------------------------- +# Functions +#----------------------------------------------------------------------------- + +#------------------------------------------------------------------------------ +# Function: Write an error message and exit +# Parameters: $message +# Input: None +# Output: None +# Return: None +#------------------------------------------------------------------------------ +sub error { + print STDERR "Error: $_[0].\n"; + exit 1; +} + +#------------------------------------------------------------------------------ +# Function: Write a debug message +# Parameters: $message +# Input: $Debug +# Output: None +# Return: None +#------------------------------------------------------------------------------ +sub debug { + my $level = $_[1] || 1; + if ($Debug >= $level) { + my $debugstring = $_[0]; + print "DEBUG $level - ".localtime(time())." : $debugstring\n"; + } +} + +#------------------------------------------------------------------------------ +# Function: Write a warning message +# Parameters: $message +# Input: $Debug +# Output: None +# Return: None +#------------------------------------------------------------------------------ +sub warning { + my $messagestring=shift; + if ($Debug) { debug("$messagestring",1); } + print STDERR "$messagestring\n"; +} + +#----------------------------------------------------------------------------- +# Function: Return 1 if string contains only ascii chars +# Input: String +# Return: 0 or 1 +#----------------------------------------------------------------------------- +sub IsAscii { + my $string=shift; + if ($Debug) { debug("IsAscii($string)",5); } + if ($string =~ /^[\w\+\-\/\\\.%,;:=\"\'&?!\s]+$/) { + if ($Debug) { debug(" Yes",5); } + return 1; # Only alphanum chars (and _) or + - / \ . % , ; : = " ' & ? space \t + } + if ($Debug) { debug(" No",5); } + return 0; +} + +#----------------------------------------------------------------------------- +# DRA Function: Return 1 if DNS lookup should be skipped +# Input: String +# Return: 0 or 1 +#----------------------------------------------------------------------------- +sub SkipDNSLookup { + foreach my $match (@SkipDNSLookupFor) { if ($_[0] =~ /$match/i) { return 1; } } + 0; # Not in @SkipDNSLookupFor +} + +#----------------------------------------------------------------------------- +# Function: Function that wait for DNS lookup (can be threaded) +# Input: String +# Return: 0 or 1 +#----------------------------------------------------------------------------- +sub MakeDNSLookup { + my $ipaddress=shift; + $NbOfDNSLookupAsked++; + use Socket; $AFINET=AF_INET; + my $tid=0; + $tid=$MaxNbOfThread?eval("threads->self->tid()"):0; + if ($Debug) { debug(" ***** Thread id $tid: MakeDNSlookup started (for $ipaddress)",4); } + my $lookupresult=gethostbyaddr(pack("C4",split(/\./,$ipaddress)),$AFINET); # This is very slow, may took 20 seconds + if (! $lookupresult || $lookupresult =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ || ! IsAscii($lookupresult)) { + $TmpDNSLookup{$ipaddress}='*'; + } + else { + $TmpDNSLookup{$ipaddress}=$lookupresult; + } + if ($Debug) { debug(" ***** Thread id $tid: MakeDNSlookup done ($ipaddress resolved into $TmpDNSLookup{$ipaddress})",4); } + delete $threadarray{$ipaddress}; + return; +} + +#----------------------------------------------------------------------------- +# Function: WriteRecordsReadyInQueue +# Input: - +# Return: 0 +#----------------------------------------------------------------------------- +sub WriteRecordsReadyInQueue { + my $logfilechosen=shift; + if ($Debug) { debug("Check head of queue to write records ready to flush (QueueCursor=$QueueCursor, QueueSize=".(scalar keys %QueueRecords).")",4); } + while ( $QueueHostsToResolve{$QueueCursor} && ( ($QueueHostsToResolve{$QueueCursor} eq '*') || ($MyDNSTable{$QueueHostsToResolve{$QueueCursor}}) || ($TmpDNSLookup{$QueueHostsToResolve{$QueueCursor}}) ) ) { + # $QueueCursor point to a ready record + if ($QueueHostsToResolve{$QueueCursor} eq '*') { + if ($Debug) { debug(" First elem in queue is ready. No change on it. We pull it.",4); } + } + else { + if ($MyDNSTable{$QueueHostsToResolve{$QueueCursor}}) { + if ($MyDNSTable{$QueueHostsToResolve{$QueueCursor}} ne '*') { + $QueueRecords{$QueueCursor}=~s/$QueueHostsToResolve{$QueueCursor}/$MyDNSTable{$QueueHostsToResolve{$QueueCursor}}/; + if ($Debug) { debug(" First elem in queue has been resolved (found in MyDNSTable $MyDNSTable{$QueueHostsToResolve{$QueueCursor}}). We pull it.",4); } + } + } + elsif ($TmpDNSLookup{$QueueHostsToResolve{$QueueCursor}}) { + if ($TmpDNSLookup{$QueueHostsToResolve{$QueueCursor}} ne '*') { + $QueueRecords{$QueueCursor}=~s/$QueueHostsToResolve{$QueueCursor}/$TmpDNSLookup{$QueueHostsToResolve{$QueueCursor}}/; + if ($Debug) { debug(" First elem in queue has been resolved (found in TmpDNSLookup $TmpDNSLookup{$QueueHostsToResolve{$QueueCursor}}). We pull it.",4); } + } + } + } + # Record is ready, we output it. + if ($AddFileNum) { print "$logfilechosen "; } + if ($AddFileName) { print "$LogFileToDo{$logfilechosen} "; } + print "$QueueRecords{$QueueCursor}\n"; + delete $QueueRecords{$QueueCursor}; + delete $QueueHostsToResolve{$QueueCursor}; + $QueueCursor++; + } + return 0; +} + +#----------------------------------------------------------------------------- +# Function: Check if thread are enabled or not +# Input: - +# Return: - +#----------------------------------------------------------------------------- +sub Check_Thread_Use { + if ($] >= 5.008) { for (0..@ARGV-1) { if ($ARGV[$_] =~ /^-dnslookup[:=](\d{1,2})/i) { + if ($UseThread) { + if (!eval ('require "threads.pm";')) { &error("Failed to load perl module 'threads' required for multi-threaded DNS lookup".($@?": $@":"")); } + if (!eval ('require "threads/shared.pm";')) { &error("Failed to load perl module 'threads::shared' required for multi-threaded DNS lookup".($@?": $@":"")); } + } + else { &error("Multi-thread is disabled in default version of this script.\nYou must manually edit the file '$0' to comment/uncomment all\nlines marked with 'ENABLETHREAD' string to enable multi-threading"); } + } } + } +} + + +#----------------------------------------------------------------------------- +# MAIN +#----------------------------------------------------------------------------- +($DIR=$0) =~ s/([^\/\\]*)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1; + +# Get parameters (Note: $MaxNbOfThread is already known +my $cpt=1; +for (0..@ARGV-1) { + if ($ARGV[$_] =~ /^-/) { + if ($ARGV[$_] =~ /debug=(\d)/i) { $Debug=$1; } + elsif ($ARGV[$_] =~ /dnscache=/i) { $DNSLookup||=2; $DNSCache=$ARGV[$_]; $DNSCache =~ s/-dnscache=//; } + elsif ($ARGV[$_] =~ /dnslookup[:=](\d{1,2})/i) { $DNSLookup||=1; $MaxNbOfThread=$1; } + elsif ($ARGV[$_] =~ /dnslookup/i) { $DNSLookup||=1; } + elsif ($ARGV[$_] =~ /showsteps/i) { $ShowSteps=1; } + elsif ($ARGV[$_] =~ /addfilenum/i) { $AddFileNum=1; } + elsif ($ARGV[$_] =~ /addfilename/i) { $AddFileName=1; } + else { print "Unknown argument $ARGV[$_] ignored\n"; } + } + else { + push @ParamFile, $ARGV[$_]; + $cpt++; + } +} +if ($Debug) { $|=1; } + +if ($Debug) { + debug(ucfirst($PROG)." - $VERSION - Perl $^X $]",1); + debug("DNSLookup=$DNSLookup"); + debug("DNSCache=$DNSCache"); + debug("MaxNbOfThread=$MaxNbOfThread"); +} + +# Disallow MaxNbOfThread and Perl < 5.8 +if ($] < 5.008 && $MaxNbOfThread) { + error("Multi-threaded DNS lookup is only supported with Perl 5.8 or higher (not $]). Use -dnslookup option instead"); +} + +# Warning, there is a memory hole in ActiveState perl version (in delete functions) +if ($^X =~ /activestate/i || $^X =~ /activeperl/i) { + # TODO Add a warning + +} + +if (scalar @ParamFile == 0) { + print "----- $PROG $VERSION (c) Laurent Destailleur -----\n"; + print "$PROG allows you to get one unique output log file, sorted on date,\n"; + print "built from particular sources:\n"; + print " - It can read several input log files,\n"; + print " - It can read .gz/.bz2 log files,\n"; + print " - It can also makes a fast reverse DNS lookup to replace\n"; + print " all IP addresses into host names in resulting log file.\n"; + print "$PROG comes with ABSOLUTELY NO WARRANTY. It's a free software\n"; + print "distributed with a GNU General Public License (See COPYING.txt file).\n"; + print "$PROG is part of AWStats but can be used alone as a log merger\n"; + print "or resolver before using any other log analyzer.\n"; + print "\n"; + print "Usage:\n"; + print " $PROG.$Extension [options] file\n"; + print " $PROG.$Extension [options] file1 ... filen\n"; + print " $PROG.$Extension [options] *.*\n"; + print " perl $PROG.$Extension [options] *.* > newfile\n"; + print "Options:\n"; + print " -dnslookup make a reverse DNS lookup on IP adresses\n"; + print " -dnslookup=n same with a n parallel threads instead of serial requests\n"; + print " -dnscache=file make DNS lookup from cache file first before network lookup\n"; + print " -showsteps print on stderr benchmark information every $NBOFLINESFORBENCHMARK lines\n"; + print " -addfilenum if used with several files, file number can be added in first\n"; + print " -addfilename if used with several files, file name can be added in first\n"; + print " field of output file. This can be used to add a cluster id\n"; + print " when log files come from several load balanced computers.\n"; + print "\n"; + + print "This runs $PROG in command line to open one or several\n"; + print "server log files to merge them (sorted on date) and/or to make a reverse\n"; + print "DNS lookup (if asked). The result log file is sent on standard output.\n"; + print "Note: $PROG is not a 'sort' tool to sort one file. It's a\n"; + print "software able to output sorted log records (with a reverse DNS lookup\n"; + print "included or not) even if log records are dispatched in several files.\n"; + print "Each of thoose files must be already independently sorted itself\n"; + print "(but that is the case in all web server log files). So you can use it\n"; + print "for load balanced log files or to group several old log files.\n"; + print "\n"; + print "Don't forget that the main goal of logresolvemerge is to send log records to\n"; + print "a log analyzer in a sorted order without merging files on disk (NO NEED\n"; + print "OF DISK SPACE AT ALL) and without loading files into memory (NO NEED\n"; + print "OF MORE MEMORY). Choose of output records is done on the fly.\n"; + print "\n"; + print "So logresolvemerge is particularly usefull when you want to output several\n"; + print "and/or large log files in a fast process, with no use of disk or\n"; + print "more memory, and in a chronological order through a pipe (to be used by a log\n"; + print "analyzer).\n"; + print "\n"; + print "Note: If input records are not 'exactly' sorted but 'nearly' sorted (this\n"; + print "occurs with heavy servers), this is not a problem, the output will also\n"; + print "be 'nearly' sorted but a few log analyzers (like AWStats) knowns how to deal\n"; + print "with such logs.\n"; + print "\n"; + print "WARNING: If log files are old MAC text files (lines ended with CR char), you\n"; + print "can't run this tool on Win or Unix platforms.\n"; + print "\n"; + print "WARNING: Because of important memory holes in ActiveState Perl version, use\n"; + print "another Perl interpreter if you need to process large lof files.\n"; + print "\n"; + print "Now supports/detects:\n"; + print " Automatic detection of log format\n"; + print " Files can be .gz/.bz2 files if zcat/bzcat tools are available in PATH.\n"; + print " Multithreaded reverse DNS lookup (several parallel requests) with Perl 5.8+.\n"; + print "New versions and FAQ at http://awstats.sourceforge.net\n"; + exit 0; +} + +# Get current time +my $nowtime=time; +my ($nowsec,$nowmin,$nowhour,$nowday,$nowmonth,$nowyear) = localtime($nowtime); +if ($nowyear < 100) { $nowyear+=2000; } else { $nowyear+=1900; } +my $nowsmallyear=$nowyear;$nowsmallyear =~ s/^..//; +if (++$nowmonth < 10) { $nowmonth = "0$nowmonth"; } +if ($nowday < 10) { $nowday = "0$nowday"; } +if ($nowhour < 10) { $nowhour = "0$nowhour"; } +if ($nowmin < 10) { $nowmin = "0$nowmin"; } +if ($nowsec < 10) { $nowsec = "0$nowsec"; } +# Get tomorrow time (will be used to discard some record with corrupted date (future date)) +my ($tomorrowsec,$tomorrowmin,$tomorrowhour,$tomorrowday,$tomorrowmonth,$tomorrowyear) = localtime($nowtime+86400); +if ($tomorrowyear < 100) { $tomorrowyear+=2000; } else { $tomorrowyear+=1900; } +my $tomorrowsmallyear=$tomorrowyear;$tomorrowsmallyear =~ s/^..//; +if (++$tomorrowmonth < 10) { $tomorrowmonth = "0$tomorrowmonth"; } +if ($tomorrowday < 10) { $tomorrowday = "0$tomorrowday"; } +if ($tomorrowhour < 10) { $tomorrowhour = "0$tomorrowhour"; } +if ($tomorrowmin < 10) { $tomorrowmin = "0$tomorrowmin"; } +if ($tomorrowsec < 10) { $tomorrowsec = "0$tomorrowsec"; } +my $timetomorrow=$tomorrowyear.$tomorrowmonth.$tomorrowday.$tomorrowhour.$tomorrowmin.$tomorrowsec; + +# Init other parameters +$NBOFLINESFORBENCHMARK--; +if ($ENV{"GATEWAY_INTERFACE"}) { $DirCgi=''; } +if ($DirCgi && !($DirCgi =~ /\/$/) && !($DirCgi =~ /\\$/)) { $DirCgi .= '/'; } +if (! $DirData || $DirData eq '.') { $DirData=$DIR; } # If not defined or choosed to "." value then DirData is current dir +if (! $DirData) { $DirData='.'; } # If current dir not defined then we put it to "." +$DirData =~ s/\/$//; + +#my %monthlib = ( "01","$Message[60]","02","$Message[61]","03","$Message[62]","04","$Message[63]","05","$Message[64]","06","$Message[65]","07","$Message[66]","08","$Message[67]","09","$Message[68]","10","$Message[69]","11","$Message[70]","12","$Message[71]" ); +# monthnum must be in english because it's used to translate log date in apache log files which are always in english +my %monthnum = ( "Jan","01","jan","01","Feb","02","feb","02","Mar","03","mar","03","Apr","04","apr","04","May","05","may","05","Jun","06","jun","06","Jul","07","jul","07","Aug","08","aug","08","Sep","09","sep","09","Oct","10","oct","10","Nov","11","nov","11","Dec","12","dec","12" ); + +if ($DNSCache) { + if ($Debug) { debug("Load DNS Cache file $DNSCache",2); } + open(CACHE, "<$DNSCache") or error("Can't open cache file $DNSCache"); + while () { + my ($time, $ip, $name) = split; + if ($ip && $name) { + $name="$ip" if $name eq '*'; + $MyDNSTable{$ip}=$name; + } + } + close CACHE; +} + +#----------------------------------------------------------------------------- +# PROCESSING CURRENT LOG(s) +#----------------------------------------------------------------------------- +my $NbOfLinesRead=0; +my $NbOfLinesParsed=0; +my $logfilechosen=0; +my $starttime=time(); + +# Define the LogFileToDo list +$cpt=1; +foreach my $key (0..(@ParamFile-1)) { + if ($ParamFile[$key] !~ /\*/ && $ParamFile[$key] !~ /\?/) { + + if ($Debug) { debug("DBG1 Log file $ParamFile[$key] is added to LogFileToDo with number $cpt."); } + # Check for supported compression + if ($ParamFile[$key] =~ /$zcat_file/) { + if ($Debug) { debug("GZIP compression detected for Log file $ParamFile[$key]."); } + # Modify the name to include the zcat command + $ParamFile[$key] = $zcat . ' ' . $ParamFile[$key] . ' |'; + } + elsif ($ParamFile[$key] =~ /$bzcat_file/) { + if ($Debug) { debug("BZ2 compression detected for Log file $ParamFile[$key]."); } + # Modify the name to include the bzcat command + $ParamFile[$key] = $bzcat . ' ' . $ParamFile[$key] . ' |'; + } + + $LogFileToDo{$cpt}=@ParamFile[$key]; + $cpt++; + + } + else { + my $DirFile=$ParamFile[$key]; $DirFile =~ s/([^\/\\]*)$//; + $ParamFile[$key] = $1; + if ($DirFile eq '') { $DirFile = '.'; } + $ParamFile[$key] =~ s/\./\\\./g; + $ParamFile[$key] =~ s/\*/\.\*/g; + $ParamFile[$key] =~ s/\?/\./g; + if ($Debug) { debug("Search for file \"$ParamFile[$key]\" into \"$DirFile\""); } + opendir(DIR,"$DirFile"); + my @filearray = sort readdir DIR; + close DIR; + foreach my $i (0..$#filearray) { + if ("$filearray[$i]" =~ /^$ParamFile[$key]$/ && "$filearray[$i]" ne "." && "$filearray[$i]" ne "..") { + + if ($Debug) { debug("DBG2 Log file $filearray[$i] is added to LogFileToDo with number $cpt."); } + # Check for supported compression + if ($filearray[$i] =~ /$zcat_file/) { + if ($Debug) { debug("GZIP compression detected for Log file $filearray[$i]."); } + # Modify the name to include the zcat command + $LogFileToDo{$cpt}=$zcat . ' ' . "$DirFile/$filearray[$i]" . ' |'; + } + elsif ($filearray[$i] =~ /$bzcat_file/) { + if ($Debug) { debug("BZ2 compression detected for Log file $filearray[$i]."); } + # Modify the name to include the bzcat command + $LogFileToDo{$cpt}=$bzcat . ' ' . "$DirFile/$filearray[$i]" . ' |'; + } + else { + $LogFileToDo{$cpt}="$DirFile/$filearray[$i]"; + } + $cpt++; + + } + } + } +} + +# If no files to process +if (scalar keys %LogFileToDo == 0) { + error("No input log file found"); +} + +# Open all log files +if ($Debug) { debug("Start of processing ".(scalar keys %LogFileToDo)." log file(s), $MaxNbOfThread threads max"); } +foreach my $logfilenb (keys %LogFileToDo) { + if ($Debug) { debug("Open log file number $logfilenb: \"$LogFileToDo{$logfilenb}\""); } + open("LOG$logfilenb","$LogFileToDo{$logfilenb}") || error("Couldn't open log file \"$LogFileToDo{$logfilenb}\" : $!"); + binmode "LOG$logfilenb"; # To avoid pb of corrupted text log files with binary chars. +} + +$QueueCursor=1; +while (1 == 1) +{ + # BEGIN Read new record + # For each log file if logfilechosen is 0 + # If not, we go directly to log file instead of iterating over all keys for a match + #---------------------------------------------------------------------------------- + my @readlist; + if($logfilechosen == 0) { + @readlist = keys %LogFileToDo; + } else { + @readlist = ($logfilechosen); + } + foreach my $logfilenb (@readlist) + { + if ($Debug) { debug("Search next record in file number $logfilenb",3); } + # Read chosen log file until we found a record with good date or reaching end of file + while (1 == 1) { + my $LOG="LOG$logfilenb"; + $_=<$LOG>; # Read new line + if (! $_) { # No more records in log file number $logfilenb + if ($Debug) { debug(" No more records in file number $logfilenb",2); } + delete $LogFileToDo{$logfilenb}; + last; + } + + $NbOfLinesRead++; + chomp $_; s/\r$//; + + if (/^#/) { next; } # Ignore comment lines (ISS writes such comments) + if (/^!!/) { next; } # Ignore comment lines (Webstar writes such comments) + if (/^$/) { next; } # Ignore blank lines (With ISS: happens sometimes, with Apache: possible when editing log file) + + $linerecord{$logfilenb}=$_; + + # Check filters + #---------------------------------------------------------------------- + + # Split DD/Month/YYYY:HH:MM:SS or YYYY-MM-DD HH:MM:SS or MM/DD/YY\tHH:MM:SS + my $year=0; my $month=0; my $day=0; my $hour=0; my $minute=0; my $second=0; + if ($_ =~ /(\d\d\d\d)-(\d\d)-(\d\d)\s(\d\d):(\d\d):(\d\d)/) { $year=$1; $month=$2; $day=$3; $hour=$4; $minute=$5; $second=$6; } + elsif ($_ =~ /\[(\d\d)[\/:\s](\w+)[\/:\s](\d\d\d\d)[\/:\s](\d\d)[\/:\s](\d\d)[\/:\s](\d\d) /) { $year=$3; $month=$2; $day=$1; $hour=$4; $minute=$5; $second=$6; } + elsif ($_ =~ /\[\w+ (\w+) (\d\d) (\d\d)[\/:\s](\d\d)[\/:\s](\d\d) (\d\d\d\d)\]/) { $year=$6; $month=$1; $day=$2; $hour=$3; $minute=$4; $second=$5; } + + if ($monthnum{$month}) { $month=$monthnum{$month}; } # Change lib month in num month if necessary + + # Create $timerecord like YYYYMMDDHHMMSS + $timerecord{$logfilenb}=int("$year$month$day$hour$minute$second"); + if ($timerecord{$logfilenb}<10000000000000) { + if ($Debug) { debug(" This record is corrupted (no date found)",3); } + $corrupted{$logfilenb}++; + next; + } + if ($Debug) { debug(" This is next record for file $logfilenb : timerecord=$timerecord{$logfilenb}",3); } + + # Sort and insert into timerecordorder, oldest at end/back of array + # At the beginning, timerecordorder is empty. Then beceause the first pass is + # a loop on each file to read each first line, the timerecordorder size is + # number of input files. + # After, each new loop, read only one new line, so timerecordorder size increase + # by one but decrease just after by the pop command later. + my $inserted=0; + for(my $c=$#timerecordorder; $c>=0 ; $c--) { + if($timerecord{$logfilenb} <= $timerecord{$timerecordorder[$c]}) + { + # Is older or equal than index at $c, add after + $timerecordorder[$c + 1]=$logfilenb; + $inserted = 1; + last; + } else { + $timerecordorder[$c + 1]=$timerecordorder[$c]; + } + } + if(! $inserted) { + $timerecordorder[0] = $logfilenb; + } + + last; + } + } + # END Read new lines for each log file. After this, following var are filled + # $timerecord{$logfilenb} + # @timerecordorder array + + # We choose which record of which log file to process + if ($Debug) { debug("Choose which record of which log file to process",3); } + $logfilechosen=pop(@timerecordorder); + if(!defined($logfilechosen)) { last; } # No more record to process + + # Record is chosen + if ($Debug) { debug(" We choosed to qualify record of file number $logfilechosen",3); } + if ($Debug) { debug(" Record is $linerecord{$logfilechosen}",3); } + + # Record is approved. We found a new line to parse in file number $logfilechosen + #------------------------------------------------------------------------------- + $NbOfLinesParsed++; + if ($ShowSteps) { + if ((++$NbOfLinesShowsteps & $NBOFLINESFORBENCHMARK) == 0) { + my $delay=(time()-$starttime)||1; + print STDERR "$NbOfLinesParsed lines processed (".(1000*$delay)." ms, ".int($NbOfLinesShowsteps/$delay)." lines/seconds)\n"; + } + } + + # Do DNS lookup + #-------------------- + my $Host=''; + my $ip=0; + if ($DNSLookup) { # DNS lookup is 1 or 2 + if ($linerecord{$logfilechosen} =~ /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { $ip=4; $Host=$1; } # IPv4 + elsif ($linerecord{$logfilechosen} =~ /([0-9A-F]*:)/i) { $ip=6; $Host=$1; } # IPv6 + if ($ip) { + # Check in static DNS cache file + if ($MyDNSTable{$Host}) { + if ($Debug) { debug(" DNS lookup asked for $Host and found in static DNS cache file: $MyDNSTable{$Host}",4); } + } + elsif ($DNSLookup==1) { + # Check in session cache (dynamic DNS cache file + session DNS cache) + if (! $threadarray{$Host} && ! $TmpDNSLookup{$Host}) { + if (@SkipDNSLookupFor && &SkipDNSLookup($Host)) { + $TmpDNSLookup{$Host}='*'; + if ($Debug) { debug(" No need of reverse DNS lookup for $Host, skipped at user request.",4); } + } + else { + if ($ip == 4) { + # Create or not a new thread + if ($MaxNbOfThread) { + if (! $threadarray{$Host}) { # No thread already launched for $Host + while ((scalar keys %threadarray) >= $MaxNbOfThread) { + if ($Debug) { debug(" $MaxNbOfThread thread running reached, so we wait",4); } + sleep 1; + } + $threadarray{$Host}=1; # Semaphore to tell thread for $Host is active +# my $t = new Thread \&MakeDNSLookup, $Host; + my $t = threads->create(sub { MakeDNSLookup($Host) }); + if (! $t) { error("Failed to create new thread"); } + if ($Debug) { debug(" Reverse DNS lookup for $Host queued in thread ".$t->tid,4); } + $t->detach(); # We don't need to keep return code + } + else { + if ($Debug) { debug(" Reverse DNS lookup for $Host already queued in a thread"); } + } + # Here, this is the only way, $TmpDNSLookup{$Host} can be not defined + } else { + &MakeDNSLookup($Host); + if ($Debug) { debug(" Reverse DNS lookup for $Host done: $TmpDNSLookup{$Host}",4); } + } + } + elsif ($ip == 6) { + $TmpDNSLookup{$Host}='*'; + if ($Debug) { debug(" Reverse DNS lookup for $Host not available for IPv6",4); } + } + } + } else { + if ($Debug) { debug(" Reverse DNS lookup already queued or done for $Host: $TmpDNSLookup{$Host}",4); } + } + } + else { + if ($Debug) { debug(" DNS lookup by static DNS cache file asked for $Host but not found.",4); } + } + } + else { + if ($Debug) { debug(" DNS lookup asked for $Host but this is not an IP address.",4); } + $DNSLookupAlreadyDone=$LogFileToDo{$logfilechosen}; + } + } + else { + if ($linerecord{$logfilechosen} =~ /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { $ip=4; $Host=$1; } # IPv4 + elsif ($linerecord{$logfilechosen} =~ /([0-9A-F]*:)/i) { $ip=6; $Host=$1; } # IPv6 + if ($Debug) { debug(" No DNS lookup asked.",4); } + } + + # Put record in record queue + if ($Debug) { debug("Add record $NbOfLinesParsed in record queue (with host to resolve = ".($Host?$Host:'*').")",4); } + $QueueRecords{$NbOfLinesParsed}=$linerecord{$logfilechosen}; + + # Put record in host queue + # If there is a host to resolve, we add line to queue with value of host to resolve + # $Host is '' (no ip found) or is ip + if ($DNSLookup==0) { + $QueueHostsToResolve{$NbOfLinesParsed}='*'; + } + if ($DNSLookup==1) { + $QueueHostsToResolve{$NbOfLinesParsed}=$Host?$Host:'*'; + } + if ($DNSLookup==2) { + $QueueHostsToResolve{$NbOfLinesParsed}=$MyDNSTable{$Host}?$Host:'*'; + } + + # Print all records in head of queue that are ready + &WriteRecordsReadyInQueue($logfilechosen); + +} # End of processing new record. Loop on next one. + +if ($Debug) { debug("End of processing log file(s)"); } + +# Close all log files +foreach my $logfilenb (keys %LogFileToDo) { + if ($Debug) { debug("Close log file number $logfilenb"); } + close("LOG$logfilenb") || error("Command for pipe '$LogFileToDo{$logfilenb}' failed"); +} + +while ( $QueueHostsToResolve{$QueueCursor} && $QueueHostsToResolve{$QueueCursor} ne '*' && ! $MyDNSTable{$QueueHostsToResolve{$QueueCursor}} && ! $TmpDNSLookup{$QueueHostsToResolve{$QueueCursor}} ) { + sleep 1; + # Print all records in head of queue that are ready + &WriteRecordsReadyInQueue($logfilechosen); +} + +# Waiting queue is empty +if ($MaxNbOfThread) { + foreach my $t (threads->list()) { + if ($Debug) { debug("Join thread $t"); } + $t->join(); + } +} + +# DNSLookup warning +if ($DNSLookup==1 && $DNSLookupAlreadyDone) { + warning("Warning: $PROG has detected that some host names were already resolved in your logfile $DNSLookupAlreadyDone.\nIf DNS lookup was already made by the logger (web server) in ALL your log files, you should not use -dnslookup option to increase $PROG speed."); +} + +if ($Debug) { + debug("Total nb of read lines: $NbOfLinesRead"); + debug("Total nb of parsed lines: $NbOfLinesParsed"); + debug("Total nb of DNS lookup asked: $NbOfDNSLookupAsked"); +} + +#if ($DNSCache) { +# open(CACHE, ">$DNSCache") or die; +# foreach (keys %TmpDNSLookup) { +# $TmpDNSLookup{$_}="*" if $TmpDNSLookup{$_} eq "ip"; +# print CACHE "0\t$_\t$TmpDNSLookup{$_}\n"; +# } +# close CACHE; +#} + +0; # Do not remove this line diff --git a/debian/alternc-awstats.dirs b/debian/alternc-awstats.dirs new file mode 100644 index 00000000..6739d8e7 --- /dev/null +++ b/debian/alternc-awstats.dirs @@ -0,0 +1,14 @@ +etc/apache +etc/awstats +etc/alternc/templates/awstats +var/cache/awstats +var/alternc/bureau/class +var/alternc/bureau/admin +var/alternc/bureau/locales/fr_FR/LC_MESSAGES +var/alternc/bureau/locales/en_US/LC_MESSAGES +var/alternc/bureau/locales/es_ES/LC_MESSAGES +usr/lib/alternc +usr/share/alternc +usr/share/doc/alternc-awstats +usr/share/lintian/overrides +usr/share/awstats/icon/other/ diff --git a/debian/alternc-awstats.lintian-override b/debian/alternc-awstats.lintian-override new file mode 100644 index 00000000..aa578ef3 --- /dev/null +++ b/debian/alternc-awstats.lintian-override @@ -0,0 +1,5 @@ +alternc-awstats: non-standard-dir-in-var var/alternc/ +alternc-awstats: file-in-unusual-dir +alternc-awstats: no-debconf-config +alternc-awstats: postinst-does-not-load-confmodule + diff --git a/debian/alternc-awstats.postinst b/debian/alternc-awstats.postinst new file mode 100755 index 00000000..42483e3f --- /dev/null +++ b/debian/alternc-awstats.postinst @@ -0,0 +1,124 @@ +#!/bin/sh -e + +# Uses debconf +. /usr/share/debconf/confmodule + +MENUFILE="/etc/alternc/menulist.txt" +LOGAPACHE="/etc/alternc/awstats.log.alternc.conf" +APACHEROTATE="/etc/logrotate.d/apache2" + +logrotate_apache() { + cp -a -f $APACHEROTATE $APACHEROTATE.tmp + sed -e 's/create 640 root adm/create 640 root www-data/' < $APACHEROTATE > $APACHEROTATE.tmp + mv -f $APACHEROTATE.tmp $APACHEROTATE +} + +case "$1" in + configure) + + # Then, configure the quota for "aws" + db_get alternc-awstats/default_quota_value || true + /usr/lib/alternc/quota_init aws $RET + + db_stop + + echo "Installing mysql table" + mysql --defaults-file=/etc/alternc/my.cnf \ + $LOGAPACHE < $LOGAPACHE <$MENUFILE.alternc_awstats + mv -f $MENUFILE.alternc_awstats $MENUFILE + fi + + echo "**********************************************" + echo "* ALTERNC-AWSTATS *" + echo "* Add an autorized user called 'admin' in *" + echo "* statistics section, so he will access *" + echo "* every stats of every users *" + echo "**********************************************" + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# + +# vim: et sw=4 diff --git a/debian/alternc-awstats.postrm b/debian/alternc-awstats.postrm new file mode 100755 index 00000000..30395efa --- /dev/null +++ b/debian/alternc-awstats.postrm @@ -0,0 +1,44 @@ +#!/bin/sh -e + +MENUFILE="/etc/alternc/menulist.txt" + +case "$1" in + remove) + # Remove Awstats references from Apache configuration + # unconfigure /etc/alternc/templates/apache/httpd.conf + # unconfigure /etc/alternc/templates/apache-ssl/httpd.conf + alternc.install + + if grep -qs "menu_aws.php" $MENUFILE; then + rm -f $MENUFILE.alternc_awstats + cat $MENUFILE | grep -v "menu_aws.php" >$MENUFILE.alternc_awstats + mv -f $MENUFILE.alternc_awstats $MENUFILE + fi + ;; + purge) + #/usr/lib/alternc/quota_delete aws + if [ -e "$CONFIGFILE" -a -x "/usr/bin/mysql" ]; then + . "$CONFIGFILE" + mysql -f --defaults-file=/etc/alternc/my.cnf \ + -e "DROP TABLE IF EXISTS aws,aws_users,aws_access;" + fi + #rm -rf /var/cache/awstats + #rm -f /etc/alternc/awstats.htpasswd + rm -f /etc/alternc/alterncawstats.conf \ + /etc/apache-ssl/conf.d/alterncawstats.conf + + # FIXME : ALTERNC DEPENDS ON APACHE2, APACHE IS NO LONGER REQUIRED + # REMOVE THE FOLLOWING LINE TO CLEAN THIS FILE + + #if [ -x /usr/sbin/apache ]; then + # rm -f /etc/apache/conf.d/alterncawstats.conf + #fi + #if [ -x /usr/sbin/apache2 ]; then + rm -f /etc/apache2/conf.d/alterncawstats.conf + #fi + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/alternc-awstats.preinst b/debian/alternc-awstats.preinst new file mode 100755 index 00000000..63fbff78 --- /dev/null +++ b/debian/alternc-awstats.preinst @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# Check that AlternC is properly installed/configured +if [ -f /etc/alternc/local.sh ] +then + exit 0 +else + # Source debconf library. + . /usr/share/debconf/confmodule + db_version 2.0 + db_title AlternC-Awstats + db_fset alternc-awstats/errorinstall seen false + db_input medium alternc-awstats/errorinstall + db_go + # il FAUT qu'AlternC soit proprement configuré pour installer awstats + exit 1 +fi + +#DEBHELPER# diff --git a/debian/control b/debian/control index b2e67f5f..5215d4d6 100644 --- a/debian/control +++ b/debian/control @@ -133,3 +133,20 @@ Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian automatique des profiles avec la bonne adresse et la bonne langue. . Pour plus d'informations, consultez http://www.alternc.com/ + +Package: alternc-awstats +Priority: optional +Section: admin +Architecture: all +Pre-depends: debconf +Depends: alternc (>=1.1), awstats (>=6.1-1), php5-cli +Suggests: apachemerge +Description: Awstats statistics module for AlternC + AlternC is a mutualized hosting software manager for Linux. + It allows you to manage your websites, domains, ftp, emails, aliases, + web statistics, mailing-lists, jabber accounts, etc. + . + This package is an optional module that adds awstats statistics + managment to the virtual desktop. + . + More information on http://www.alternc.com/. diff --git a/debian/rules b/debian/rules index 54c464ff..7313345e 100755 --- a/debian/rules +++ b/debian/rules @@ -99,6 +99,22 @@ install: build # alternc-squirrelmail: (cd squirrelmail && $(MAKE) install DESTDIR=$(CURDIR)/debian/alternc-squirrelmail) + # alternc-awstats: + (cd awstats && $(MAKE) install DESTDIR=$(CURDIR)/debian/alternc-awstats) + cd .. + + # Copy the desk files + cp -r awstats/bureau debian/alternc-awstats/var/alternc/ + + # Fix permisions + chown -R root:www-data debian/alternc-awstats/var/alternc/bureau + chmod -R 644 debian/alternc-awstats/var/alternc/bureau + chmod -R a+X debian/alternc-awstats/var/alternc/bureau + touch debian/alternc-awstats/var/cache/awstats/.placeholder + chown www-data:www-data debian/alternc-awstats/var/cache/awstats + chmod 755 debian/alternc-awstats/var/cache/awstats + mkdir -p debian/alternc-awstats/var/cache/awstats + # This single target is used to build all the packages, all at once, or # one at a time. So keep in mind: any options passed to commands here will # affect _all_ packages. Anything you want to only affect one package