Changeset 619

Timestamp:

06/01/07 01:35:14 (1 year ago)

Author:

rats

Message:

- DATABASE:

• changed Englisch language
  

- GUI:

• Fixed: missing $cfg in tr-function
  
• started build-in of AWStats (#7)
  

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/awstats/awstats.ispcp_tpl.conf (modified) (48 diffs)
• trunk/configs/crontab/crontab.conf (modified) (2 diffs)
• trunk/configs/crontab/working/crontab.conf (modified) (1 diff)
• trunk/configs/ispcp.conf (modified) (1 diff)
• trunk/engine/awstats/awstats_configure.pl (deleted)
• trunk/engine/awstats/awstats_exportlib.pl (deleted)
• trunk/engine/awstats/httpd_conf (deleted)
• trunk/engine/awstats/logresolvemerge.pl (deleted)
• trunk/engine/awstats/maillogconvert.pl (deleted)
• trunk/engine/awstats/urlaliasbuilder.pl (deleted)
• trunk/engine/ispcp-dmn-mngr (modified) (8 diffs)
• trunk/engine/setup/ispcp-setup (modified) (11 diffs)
• trunk/tools/awstats (deleted)

trunk/CHANGELOG

@@ -16 +16 @@
-        - GUI:
-                * Fixed: missing $cfg in tr-function
+                * started build-in of AWStats (#7)
-
-2007-05-31 Henrik Schytte

trunk/configs/awstats/awstats.ispcp_tpl.conf

@@ -1 @@
-4
+6
-#-----------------------------------------------------------------------------
-# Copy this file into awstats.www.mydomain.conf and edit this new config file
@@ -11 +11 @@
-# the config value in an AWStats running session and can be used like others.
-#-----------------------------------------------------------------------------
-18 $ - $Author: eldy $ - $Date: 2005/06/22 23:20:2
+27 $ - $Author: eldy $ - $Date: 2006/04/21 22:28:4
-
-
@@ -46 +46 @@
-# You can also use a pipe if log file come from a pipe :
-# Example: "gzip -d </var/log/apache/access.log.gz |"
-is
+are
-# Example: "/pathtotools/logresolvemerge.pl *.log |"
-#
@@ -145 +145 @@
-# virtual web server. In this case, this parameter is only used to generate
-# full URL's links when ShowLinksOnUrl option is set to 1.
-s
+z
-# Example: "myintranetserver"
-# Example: "www.domain.com"
@@ -223 +223 @@
-
-
-
+s
-# allow to "update" statistics from a web browser. Warning, when "update" is
-a
+u
-# in your web server (user "nobody" by default with Apache, "IUSR_XXX" with
-# IIS), so the "DirData" directory and all already existing history files
@@ -231 +231 @@
-# necessary to "Read/Write" (and "Modify" for Windows NTFS file systems).
-# Warning: Update process can be long so you might experience "time out"
-enough frequently
-a
+frequently enough
+u
-# line interface (or a task scheduler).
-# Possible values: 0 or 1
@@ -240 +240 @@
-
-
-
-
-
-
+
+
+
+
+
-# requiring a large amount of time, memory and CPU. This might be a problem
-# for web hosting providers that offer AWStats for large sites, on shared
@@ -264 +265 @@
-#-----------------------------------------------------------------------------
-
-
+s
-# directory. This lock is to avoid to have 2 update processes running at the
-# same time to prevent unknown conflicts problems and avoid DoS attacks when
@@ -329 +330 @@
-
-
-
+s
-# statistics for this domain/config file. This parameter is used only if
-# AllowAccessFromWebToAuthenticatedUsersOnly is set to 1.
@@ -340 +341 @@
-
-
-
-
+d
+s
-# checked and must match one of the IP address values or ranges.
-# Change : Effective immediatly
@@ -350 +351 @@
-
-
-s
+
-# error. However, you can ask AWStats to create it.
-# This option can be used by some Web Hosting Providers that has defined a 
@@ -373 +374 @@
-
-# If you prefer having the report output pages be built as XML compliant pages
-s
+
-# properly with old browsers).
-# Change : Effective immediatly
@@ -386 +387 @@
-# for both command line user and default web server user (nobody for Unix,
-# IUSR_xxx for IIS/Windows,...).
-'s
+
-# and CGI process (ran by a low level user), AWStats can save its database 
-# files with read and write permissions for everyone.
-
+s
-# set AllowToUpdateStatsFromBrowser to 1, you can change this parameter to 1.
-# Change : Effective for new updates only
@@ -403 +404 @@
-# With 0, no purge is made, so you must use a scheduled task or a web server
-# that make this purge frequently.
-a
+u
-# This parameter doesn't work with IIS (This web server doesn't let its log
-# file to be purged).
@@ -428 +429 @@
-
-
-
+s
-# for the month (awstatsMMYYYY[.*].txt) with the updated one.
-# When write errors occurs (IO, disk full,...), this historic file can be
@@ -451 +452 @@
-
-# Do not include access from clients that match following criteria.
-
-
+d
+d
-# If DNS lookup is already done in your log file, you must enter here hostname
-# criteria, else enter ip address criteria.
@@ -497 +498 @@
-
-
+# Use SkipReferrersBlackList if you want to exclude records coming from a SPAM
+# referrer. Parameter must receive a local file name containing rules applied
+# on referrer field. If parameter is empty, no filter is applied.
+# An example of such a file is available in lib/blacklist.txt
+# You can download updated version at http://www.jayallen.org/comment_spam/
+# Change : Effective for new updates only
+# Example: "/mylibpath/blacklist.txt"
+# Default: ""
+#
+# WARNING!! Using this feature make AWStats running very slower (5 times slower
+# with black list file provided with AWStats !
+#
+SkipReferrersBlackList=""
+
+
-# Include in stats, only accesses from hosts that match one of following
-# entries. For example, if you want AWStats to filter access to keep only
-s
+
-# this parameter.
-# If DNS lookup is already done in your log file, you must enter here hostname
@@ -544 +560 @@
-# Add here a list of kind of url (file extension) that must be counted as
-# "Hit only" and not as a "Hit" and "Page/Download". You can set here all
-s
+
-# are not viewed pages. URLs with such extensions are not included in the TOP
-# Pages/URL report.
@@ -582 +598 @@
-
-
-s
+
-# login with same value but different case are the same login. To tell AWStats
-s
+
-# Change : Effective for new updates only
-# Possible values: 0 or 1
@@ -612 +628 @@
-# In URL links, "?" char is used to add parameter's list in URLs. Syntax is:
-# /mypage.html?param1=value1&param2=value2
-s
+
-# their URLs. You can complete this list with all such characters.
-# Change : Effective for new updates only
@@ -697 +713 @@
-
-
-
+s
-# want (in most cases for security reasons) to have no error messages, you
-# can set this parameter to your personalized generic message.
-# Change : Effective immediatly
-
+r
-# Default: ""
-#
@@ -717 +733 @@
-
-
-
+s
-# if all the first NbOfLinesForCorruptedLog lines have a format that does not
-# match the LogFormat parameter.
@@ -741 +757 @@
-
-# DecodeUA must be set to 1 if you use Roxen web server. This server converts
-os
+OS
-# and browsers detection fail in some cases. Just change it to 1 if and only
-# if your web server is Roxen.
@@ -751 +767 @@
-
-
-
+e
-# things, that can not be tracked on other way, like:
-# - Javascript disabled
@@ -763 +779 @@
-# - Mediaplayer plugin
-# - Acrobat PDF plugin
-is
+ese
-# into a /js/ directory stored in your web document root and add the following
-# HTML code at the end of your index page (but before </BODY>) :
@@ -787 +803 @@
-#-----------------------------------------------------------------------------
-
-Following values allows you to define accuracy of AWStats entities (robots,
-
+The following values allow you to define accuracy of AWStats entities
+(robots, 
-# It might be a good idea for large web sites or ISP that provides AWStats to
-# high number of customers, to set this parameter to 1 (or 0), instead of 2.
-# Possible values:
-
-
-
-
+
+
+
+
+
+
-# Default: 2 (0 for LevelForWormsDetection)
-#
-LevelForBrowsersDetection=2         # 0 disables Browsers detection.
-                                    # 2 reduces AWStats speed by 2%
+                                    # allphones reduces AWStats speed by 5%
-LevelForOSDetection=2               # 0 disables OS detection.
-                                    # 2 reduces AWStats speed by 3%
@@ -830 +849 @@
-
-
-
+s
-# window than the main page.
-# Possible values:
@@ -842 +861 @@
-
-# You can add, in the HTML report page, a cache lifetime (in seconds) that
-
-
+the 
+s
-# Example: 3600
-# Default: 0
@@ -851 +870 @@
-
-# To avoid too large web pages, you can ask AWStats to limit number of rows of
-
+s
-# Default: 1000
-#
@@ -858 +877 @@
-
-# Set your primary language (ISO-639-1 language codes).
-
+s
-#  Albanian=al, Bosnian=ba, Bulgarian=bg, Catalan=ca,
-#  Chinese (Taiwan)=tw, Chinese (Simpliefied)=cn, Croatian=hr, Czech=cz,
-#  Danish=dk, Dutch=nl, English=en, Estonian=et, Euskara=eu, Finnish=fi,
-#  French=fr, Galician=gl, German=de, Greek=gr, Hebrew=he, Hungarian=hu,
-r
+o
-#  Latvian=lv, Norwegian (Nynorsk)=nn, Norwegian (Bokmal)=nb, Polish=pl,
-#  Portuguese=pt, Portuguese (Brazilian)=br, Romanian=ro, Russian=ru,
@@ -1039 +1058 @@
-
-# Some graphical reports are followed by the data array of values.
-report size for example), you can
-
+the report size for example), you
+can 
-# Possible values: 0 or 1
-# Default: 1
@@ -1055 +1074 @@
-
-# In the Origin chart, you have stats on where your hits came from. You can
-s hits on pages that comes
+ hits on pages that come
-# Possible values: 0 or 1
-# Default: 0
@@ -1062 +1081 @@
-
-
-Following parameter can be used to choose maximum number of lines shown for
-the particular following report
+The following parameters can be used to choose the maximum number of lines
+shown for the particular following reports
-#
-# Stats by countries/domains
@@ -1108 +1127 @@
-# Choose if you want the week report to start on sunday or monday
-# Possible values:
-
-
+s
+s
-# Default: 1
-#
@@ -1115 +1134 @@
-
-
-s
+
-# See Lang parameter for list of allowed flag/language codes.
-# If you don't want any flag link, set ShowFlagLinks to "".
@@ -1133 +1152 @@
-
-
- HTML links in its report pages, it starts thoose link
+s HTML links in its report pages, it starts those links
-# with "http://". However some links might be HTTPS links, so you can enter
-# here the root of all your HTTPS links. If all your site is a SSL web site,
@@ -1146 +1165 @@
-
-# Maximum length of URL part shown on stats page (number of characters).
-
+s
-# Default: 64
-#
@@ -1174 +1193 @@
-
-
-
+s
-# Default: 260/90
-#
@@ -1191 +1210 @@
-
-
-s
+
-# to change AWStats look.
-# Example: color_name="RRGGBB"  # RRGGBB is Red Green Blue components in Hex
@@ -1223 +1242 @@
-#-----------------------------------------------------------------------------
-
-s file
+ files
-# Plugin files must be .pm files stored in 'plugins' directory.
-# Uncomment LoadPlugin lines to enable a plugin after checking that perl
@@ -1231 +1250 @@
-# Perl modules required: None
-# Add some tooltips help on HTML report pages.
-ed
+ing
-# so server load and bandwidth.
-#
@@ -1247 +1266 @@
-# This plugin gives AWStats capability to make reverse DNS lookup on IPv6
-# addresses.
-ing
+ed
-# geoipfree or geoip plugin instead of enabled reverse DNS lookup.
-#
@@ -1254 +1273 @@
-# Plugin: HashFiles
-# Perl modules required: Storable
-
+s
-# DNS cache files loading speed, above all for very large web sites.
-#
@@ -1268 +1287 @@
-# This plugin reduces AWStats speed of 8% !
-#
-
+ /pathto/GeoIP.dat
-
-# Plugin: GeoIPfree
@@ -1402 +1421 @@
-
-# You can define your own charts, you choose here what are rows and columns
-l
+
-# products orders for example.
-# For this, edit all parameters of Extra section. Each set of parameter is a
@@ -1417 +1436 @@
-#   Put an empty string for no test on code.
-# ExtraSectionConditionX are conditions you can use to count or not the hit,
-
-
+
+
+
-# ExtraSectionFirstColumnTitleX is the first column title of the chart.
-# ExtraSectionFirstColumnValuesX is a string to tell AWStats which field to
-
+
+
-#   and how to extract the value (using regex syntax). Each different value
-#   found will appear in first column of report on a different row. Be sure
@@ -1448 +1469 @@
-
-
-
+s
-# number of possible rows an ExtraSection can report. This parameter is
-# here to protect too much memory use when you make a bad setup in your
@@ -1467 +1488 @@
-# You can include other config files using the directive with the name of the
-# config file.
-l
+
-# a lot of config files and want to maintain common values in only one file.
-# Note that when a variable is defined both in a config file and in an
-# included file, AWStats will use the last value read for parameters that
-# contains one value and AWStats will concat all values from both files for
-
+s
-#
-

trunk/configs/crontab/crontab.conf

@@ -15 +15 @@
-
-# AWStats
-
+
-
-# Rootkit Hunter
@@ -24 +24 @@
-
-# delayed tasks END.
-

trunk/configs/crontab/working/crontab.conf

@@ -3 +3 @@
-
-# Quota
-
+       
-
-# Traffic
-
-
-
+
+
+
+
-
-# Backup
-
+       
-
-# AWStats
-
+
-
-# Rootkit Hunter
-
+       
-
-# [{DMN_NAME}] backup task START.

trunk/configs/ispcp.conf

@@ -136 +136 @@
-# AWSTATS data
-#
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
-# APACHE data
-#
-
-
-APACHE_NAME = apache2

trunk/engine/ispcp-dmn-mngr

@@ -3325 +3325 @@
-    my $conf_dir = $main::cfg{'CONF_DIR'};
-
-
+CONFIG_
-
-    my $tpl_dir = "$conf_dir/awstats";
@@ -3461 +3461 @@
-    my $dmn_name = @$dmn_data[1];
-
-
-
-
-
-
+
-
-    my $awstats_fname = "awstats.$dmn_name.conf";
@@ -3498 +3494 @@
-    my $rs = undef;
-
-_dir = $main::cfg{'AWSTATS_DIR
+ = $main::cfg{'AWSTATS_ACTIVE
-
-    push_el(\@main::el, 'dmn_add_data()', 'Starting...');
@@ -3510 +3506 @@
-    }
-
-
-_dir
+h
+
-        $rs = dmn_add_awstats_data($dmn_data);
-        return $rs if ($rs != 0);
@@ -3555 +3551 @@
-    }
-
-_dir = $main::cfg{'AWSTATS_DIR
+ = $main::cfg{'AWSTATS_ACTIVE
-
-    $rs = dmn_change_named_data($dmn_data);
@@ -3569 +3565 @@
-    return $rs if ($rs != 0);
-
-
-_dir
+h
+
-        $rs = dmn_change_awstats_data($dmn_data);
-                return $rs if ($rs != 0);
@@ -3592 +3588 @@
-    my $rs = undef;
-
-_dir = $main::cfg{'AWSTATS_DIR
+ = $main::cfg{'AWSTATS_ACTIVE
-
-    push_el(\@main::el, 'dmn_del_data()', 'Starting...');
@@ -3604 +3600 @@
-    }
-
-    # check w
-    if ($awstats_dir
+# check wh
+if ($awstats
-        $rs = dmn_del_awstats_data($dmn_data);
-
-        return $rs if ($rs != 0);
-    
+
-
-    $rs = dmn_del_named_data($dmn_data);

trunk/engine/setup/ispcp-setup

@@ -121 +121 @@
-                 $main::ua{'hostname'} = $rdata;
-                 $main::ua{'hostname_local'} = ( ($1) ? $1 : $4);
-+       
+
-        } else {
-
@@ -594 +594 @@
-}
-
+ask_awstats_on {
+
+        my ($rs, $rdata) = (undef, undef);
+
+        push_el(\@main::el, 'ask_awstats_on()', 'Starting...');
+
+        my $qmsg = "\n    Activate AWStats [no]: ";
+
+        print STDOUT $qmsg;
+
+        $rdata = readline(\*STDIN);
+        chop($rdata);
+
+        if (!defined($rdata) || $rdata eq '') {
+                $main::ua{'awstats_on'} = 'no';
+        }
+        else {
+                if ($rdata eq 'yes' || $rdata eq 'y') {
+                        $main::ua{'awstats_on'} = 'yes';
+                }
+                else if ($rdata eq 'no' || $rdata eq 'n') {
+                        $main::ua{'awstats_on'} = 'no';
+                }
+                else {
+                        print STDOUT "\n    Only '(y)es' and '(n)o' are allowed!";
+                        return 1;
+                }
+        }
+
+        push_el(\@main::el, 'ask_awstats_on()', 'Ending...');
+
+        return 0;
+}
+
+ask_awstats_dyn {
+
+        my ($rs, $rdata) = (undef, undef);
+
+        push_el(\@main::el, 'ask_awstats_dyn()', 'Starting...');
+
+        my $qmsg = "\n    AWStats Mode ('(d)ynamic' or '(s)tatic') [dynamic]: ";
+
+        print STDOUT $qmsg;
+
+        $rdata = readline(\*STDIN);
+        chop($rdata);
+
+        if (!defined($rdata) || $rdata eq '') {
+                $main::ua{'awstats_dyn'} = '0';
+        }
+        else {
+                if ($rdata eq 'dynamic' || $rdata eq 'd') {
+                        $main::ua{'awstats_dyn'} = '0';
+                }
+                else if ($rdata eq 'static' || $rdata eq 's') {
+                        $main::ua{'awstats_dyn'} = '1';
+                }
+                else {
+                        print STDOUT "\n    Only '(d)ynamic' or '(s)tatic' are allowed!";
+                        return 1;
+                }
+        }
+
+        push_el(\@main::el, 'ask_awstats_dyn()', 'Ending...');
+
+        return 0;
+}
+
-sub user_dialog {
-
@@ -686 +754 @@
-        } while ($rs == 1);
-
+        do {
+
+                $rs = ask_awstats_on();
+
+        } while ($rs == 1);
+
+        do {
+
+                $rs = ask_awstats_dyn();
+
+        } while ($rs == 1);
+
+
-        push_el(\@main::el, 'user_dialog()', "hostname: $main::ua{'hostname'}");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return 0;
@@ -1055 +1140 @@
-        $rs = set_conf_val('DEFAULT_ADMIN_ADDRESS', $main::ua{'admin_email'});
-
+        return $rs if ($rs != 0);
+
+        $rs = set_conf_val('AWSTATS_ACTIVE', $main::ua{'awstats_on'});
+
+        return $rs if ($rs != 0);
+
+        $rs = set_conf_val('AWSTATS_MODE', $main::ua{'avstats_dyn'});
+
-        $rs = store_conf();
-
@@ -1288 +1381 @@
-        my $cfg_dir = "$main::cfg{'GUI_ROOT_DIR'}/tools/pma/";
-        my $tmp_dir = "/var/www/ispcp/gui/phptmp";
-
+
-        my @rand_data = ('A'..'Z', 'a'..'z', '0'..'9', '.', '/', '-', '*', ',', ':', ';');
-
-        my ($i, $blowfish) = ('', '');
-
+
-        for ($i = 0; $i < 31; $i++) {
-
+
-                $blowfish .= $rand_data[ rand() * ($#rand_data + 1) ];
-
+
-        }
-
@@ -1365 +1458 @@
-                return $rs if ($rs != 0);
-
+                if ($main::cfg{'AWSTATS_ACTIVE'} eq 'on') {
+                        my $awstats = "15     6 * * * $main::cfg{'ROOT_DIR'}/engine/awstats/awstats_updateall.pl now -awstatsprog=$main::cfg{'AWSTATS_ENGINE_DIR'}/awstats.pl";
+                }
+                else {
+                        my $awstats = '';
+                }
+
-                my %tag_hash = (
-                                                '{LOG_DIR}' => $main::cfg{'LOG_DIR'},
@@ -1370 +1470 @@
-                                                '{TRAFF_ROOT_DIR}' => $main::cfg{'TRAFF_ROOT_DIR'},
-                                                '{TOOLS_ROOT_DIR}' => $main::cfg{'TOOLS_ROOT_DIR'},
-
+
+
-                                           );
-
@@ -1420 +1521 @@
-
-        push_el(\@main::el, 'setup_resolver()', 'Starting...');
-
+
-        my $resolv_file = "/etc/resolv.conf";
-
@@ -1426 +1527 @@
-
-        $cmd = "$main::cfg{'CMD_CP'} -p -f $resolv_file $resolv_file.bkp";
-
+
-        $rs = sys_command_rs($cmd);
-
+
-        return $rs if ($rs != 0);
-
@@ -1436 +1537 @@
-                $data .= "nameserver $main::cfg{'SECONDARY_DNS'}\n";
-        }
-
+
-        $resolv_data = get_file($resolv_file);
-
+
-        # Comment this line if removing the existing nameservers causes any problem
-        $resolv_data =~ s/^nameserver[[:space:]]+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$//g;
-
+
-        $data .= $resolv_data;
-
@@ -1465 +1566 @@
-
-        my $ip = $main::ua{'eth_ip'};
-
+
-        my $hosts_file = "/etc/hosts";
-
+
-        $cmd = "$main::cfg{'CMD_CP'} -p -f $hosts_file $hosts_file.bkp";
-
+
-        $rs = sys_command_rs($cmd);
-
-
-
+
+
+
-        $data  = "# 'hosts' file configuration.\n\n";
-        $data .= "127.0.0.1\t$hostname_local\tlocalhost\n";