maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

merging awstats branch to trunk, fixes #57, fixes #58

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-03-22 12:36:59 +00:00
parent d4e310d150
commit 9b843a8ad5
54 changed files with 471 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/customer/domains/domains_delimiter.tpl
View File

@@ -1,3 +1,3 @@
<tr>
<td class="title" colspan="4">&nbsp;&nbsp;&nbsp;&nbsp;<b>{$row['domain']}</b> [<a href="http://{$row['domain']}/webalizer" target="_blank">{$lng['domains']['statstics']}</a>]</td>
<td class="title" colspan="4">&nbsp;&nbsp;&nbsp;&nbsp;<b>{$row['domain']}</b> [<a href="http://{$row['domain']}/{$statsapp}" target="_blank">{$lng['domains']['statstics']}</a>]</td>
</tr>

3
templates/misc/configfiles/gentoo/awstats/etc_awstats_awstats.model.conf.froxlor → templates/misc/awstatsmodel/awstats.froxlor.model.conf
View File

@@ -4,6 +4,7 @@ LogFormat = 1
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
DirData="{CUSTOMER_DOCROOT}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"
Include "/etc/awstats/awstats.model.conf"

3
templates/misc/configfiles/debian_lenny/awstats/etc_awstats_awstats.model_log_sql.conf.froxlor → templates/misc/awstatsmodel/awstats.froxlor.model_log_sql.conf
View File

@@ -4,6 +4,7 @@ LogFormat = "%host %virtualname %logname %time1 %methodurl %code %bytesd %refere
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
DirData="{CUSTOMER_DOCROOT}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"
Include "/etc/awstats/awstats.model.conf"

14
templates/misc/configfiles/debian_etch/awstats/etc_apache_vhosts_05_awstats.conf
View File

@@ -1,14 +0,0 @@
ScriptAlias /awstats/ "/usr/lib/cgi-bin/"
ScriptAlias /awstats "/usr/lib/cgi-bin/awstats.pl"
ScriptAlias /awstats.pl "/usr/lib/cgi-bin/awstats.pl"
Alias /awstats-icon/ "/usr/share/awstats/icon/"
<Directory "/usr/lib/cgi-bin">
Options ExecCGI
AllowOverride None
<IfModule mod_access.c>
Order allow,deny
Allow from all
</IfModule>
</Directory>

9
templates/misc/configfiles/debian_etch/awstats/etc_awstats.model.conf Normal file
View File

@@ -0,0 +1,9 @@
# for Froxlor and AWStats to work together
# you have to change the following line
# in the awstats.mode.conf file
# look for
DirData="/some/folder/"
# and comment this out with a hash (#)
#DirData="/some/folder/"

9
templates/misc/configfiles/debian_etch/awstats/etc_awstats_awstats.model.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = 1
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

9
templates/misc/configfiles/debian_etch/awstats/etc_awstats_awstats.model_log_sql.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = "%host %virtualname %logname %time1 %methodurl %code %bytesd %refererquot %uaquot"
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

6
templates/misc/configfiles/debian_etch/awstats/etc_cron.d_awstats
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*/10 * * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

6
templates/misc/configfiles/debian_etch/awstats/etc_cron.d_awstats_log_sql
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
45 0 * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

19
templates/misc/configfiles/debian_etch/awstats/etc_lighttpd_froxlor-awstats.conf
View File

@@ -1,19 +0,0 @@
#alias.url += (
# "/js/awstats_misc_tracker.js" => "/usr/share/awstats/wwwroot/js/awstats_misc_tracker.js"
#)
$HTTP["url"] =~ "^/awstats" {
alias.url += (
"/awstats/" => "<AWSTATS_PATH>",
"/awstats" => "<AWSTATS_PATH>awstats.pl",
"/awstats.pl" => "<AWSTATS_PATH>awstats.pl"
# "/awstatsicons/" => "/usr/share/awstats/wwwroot/icon/"
)
index-file.names = ( "awstatstotals.php" )
cgi.assign = (
".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl"
)
}

14
templates/misc/configfiles/debian_lenny/awstats/etc_apache_vhosts_05_awstats.conf
View File

@@ -1,14 +0,0 @@
ScriptAlias /awstats/ "/usr/lib/cgi-bin/"
ScriptAlias /awstats "/usr/lib/cgi-bin/awstats.pl"
ScriptAlias /awstats.pl "/usr/lib/cgi-bin/awstats.pl"
Alias /awstats-icon/ "/usr/share/awstats/icon/"
<Directory "/usr/lib/cgi-bin">
Options ExecCGI
AllowOverride None
<IfModule mod_access.c>
Order allow,deny
Allow from all
</IfModule>
</Directory>

9
templates/misc/configfiles/debian_lenny/awstats/etc_awstats.model.conf Normal file
View File

@@ -0,0 +1,9 @@
# for Froxlor and AWStats to work together
# you have to change the following line
# in the awstats.mode.conf file
# look for
DirData="/some/folder/"
# and comment this out with a hash (#)
#DirData="/some/folder/"

9
templates/misc/configfiles/debian_lenny/awstats/etc_awstats_awstats.model.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = 1
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

6
templates/misc/configfiles/debian_lenny/awstats/etc_cron.d_awstats
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*/10 * * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

6
templates/misc/configfiles/debian_lenny/awstats/etc_cron.d_awstats_log_sql
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
45 0 * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

19
templates/misc/configfiles/debian_lenny/awstats/etc_lighttpd_froxlor-awstats.conf
View File

@@ -1,19 +0,0 @@
#alias.url += (
# "/js/awstats_misc_tracker.js" => "/usr/share/awstats/wwwroot/js/awstats_misc_tracker.js"
#)
$HTTP["url"] =~ "^/awstats" {
alias.url += (
"/awstats/" => "<AWSTATS_PATH>",
"/awstats" => "<AWSTATS_PATH>awstats.pl",
"/awstats.pl" => "<AWSTATS_PATH>awstats.pl"
# "/awstatsicons/" => "/usr/share/awstats/wwwroot/icon/"
)
index-file.names = ( "awstatstotals.php" )
cgi.assign = (
".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl"
)
}

14
templates/misc/configfiles/gentoo/awstats/etc_apache_vhosts_05_awstats.conf
View File

@@ -1,14 +0,0 @@
ScriptAlias /awstats/ "/usr/lib/cgi-bin/"
ScriptAlias /awstats "/usr/lib/cgi-bin/awstats.pl"
ScriptAlias /awstats.pl "/usr/lib/cgi-bin/awstats.pl"
Alias /awstats-icon/ "/usr/share/awstats/icon/"
<Directory "/usr/lib/cgi-bin">
Options ExecCGI
AllowOverride None
<IfModule mod_access.c>
Order allow,deny
Allow from all
</IfModule>
</Directory>

9
templates/misc/configfiles/gentoo/awstats/etc_awstats.model.conf Normal file
View File

@@ -0,0 +1,9 @@
# for Froxlor and AWStats to work together
# you have to change the following line
# in the awstats.mode.conf file
# look for
DirData="/some/folder/"
# and comment this out with a hash (#)
#DirData="/some/folder/"

9
templates/misc/configfiles/gentoo/awstats/etc_awstats_awstats.model_log_sql.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = "%host %virtualname %logname %time1 %methodurl %code %bytesd %refererquot %uaquot"
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

6
templates/misc/configfiles/gentoo/awstats/etc_cron.d_awstats
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*/10 * * * * apache [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

6
templates/misc/configfiles/gentoo/awstats/etc_cron.d_awstats_log_sql
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
45 0 * * * apache [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

19
templates/misc/configfiles/gentoo/awstats/etc_lighttpd_froxlor-awstats.conf
View File

@@ -1,19 +0,0 @@
#alias.url += (
# "/js/awstats_misc_tracker.js" => "/usr/share/awstats/wwwroot/js/awstats_misc_tracker.js"
#)
$HTTP["url"] =~ "^/awstats" {
alias.url += (
"/awstats/" => "<AWSTATS_PATH>",
"/awstats" => "<AWSTATS_PATH>awstats.pl",
"/awstats.pl" => "<AWSTATS_PATH>awstats.pl"
# "/awstatsicons/" => "/usr/share/awstats/wwwroot/icon/"
)
index-file.names = ( "awstatstotals.php" )
cgi.assign = (
".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl"
)
}

14
templates/misc/configfiles/suse_linux_10_0/awstats/etc_apache_vhosts_05_awstats.conf
View File

@@ -1,14 +0,0 @@
ScriptAlias /awstats/ "/usr/lib/cgi-bin/"
ScriptAlias /awstats "/usr/lib/cgi-bin/awstats.pl"
ScriptAlias /awstats.pl "/usr/lib/cgi-bin/awstats.pl"
Alias /awstats-icon/ "/usr/share/awstats/icon/"
<Directory "/usr/lib/cgi-bin">
Options ExecCGI
AllowOverride None
<IfModule mod_access.c>
Order allow,deny
Allow from all
</IfModule>
</Directory>

9
templates/misc/configfiles/suse_linux_10_0/awstats/etc_awstats.model.conf Normal file
View File

@@ -0,0 +1,9 @@
# for Froxlor and AWStats to work together
# you have to change the following line
# in the awstats.mode.conf file
# look for
DirData="/some/folder/"
# and comment this out with a hash (#)
#DirData="/some/folder/"

9
templates/misc/configfiles/suse_linux_10_0/awstats/etc_awstats_awstats.model.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = 1
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

9
templates/misc/configfiles/suse_linux_10_0/awstats/etc_awstats_awstats.model_log_sql.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = "%host %virtualname %logname %time1 %methodurl %code %bytesd %refererquot %uaquot"
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

6
templates/misc/configfiles/suse_linux_10_0/awstats/etc_cron.d_awstats
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*/10 * * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

6
templates/misc/configfiles/suse_linux_10_0/awstats/etc_cron.d_awstats_log_sql
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
45 0 * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

19
templates/misc/configfiles/suse_linux_10_0/awstats/etc_lighttpd_froxlor-awstats.conf
View File

@@ -1,19 +0,0 @@
#alias.url += (
# "/js/awstats_misc_tracker.js" => "/usr/share/awstats/wwwroot/js/awstats_misc_tracker.js"
#)
$HTTP["url"] =~ "^/awstats" {
alias.url += (
"/awstats/" => "<AWSTATS_PATH>",
"/awstats" => "<AWSTATS_PATH>awstats.pl",
"/awstats.pl" => "<AWSTATS_PATH>awstats.pl"
# "/awstatsicons/" => "/usr/share/awstats/wwwroot/icon/"
)
index-file.names = ( "awstatstotals.php" )
cgi.assign = (
".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl"
)
}

14
templates/misc/configfiles/ubuntu_hardy/awstats/etc_apache_vhosts_05_awstats.conf
View File

@@ -1,14 +0,0 @@
ScriptAlias /awstats/ "/usr/lib/cgi-bin/"
ScriptAlias /awstats "/usr/lib/cgi-bin/awstats.pl"
ScriptAlias /awstats.pl "/usr/lib/cgi-bin/awstats.pl"
Alias /awstats-icon/ "/usr/share/awstats/icon/"
<Directory "/usr/lib/cgi-bin">
Options ExecCGI
AllowOverride None
<IfModule mod_access.c>
Order allow,deny
Allow from all
</IfModule>
</Directory>

9
templates/misc/configfiles/ubuntu_hardy/awstats/etc_awstats.model.conf Normal file
View File

@@ -0,0 +1,9 @@
# for Froxlor and AWStats to work together
# you have to change the following line
# in the awstats.mode.conf file
# look for
DirData="/some/folder/"
# and comment this out with a hash (#)
#DirData="/some/folder/"

9
templates/misc/configfiles/ubuntu_hardy/awstats/etc_awstats_awstats.model.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = 1
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

9
templates/misc/configfiles/ubuntu_hardy/awstats/etc_awstats_awstats.model_log_sql.conf.froxlor
View File

@@ -1,9 +0,0 @@
LogFile="{LOG_FILE}"
LogType=W
LogFormat = "%host %virtualname %logname %time1 %methodurl %code %bytesd %refererquot %uaquot"
LogSeparator=" "
SiteDomain="{SITE_DOMAIN}"
HostAliases="{HOST_ALIASES}"
# Include local configuration options identical for all virtual hosts
Include "/etc/awstats/awstats.conf.local"

6
templates/misc/configfiles/ubuntu_hardy/awstats/etc_cron.d_awstats
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*/10 * * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

6
templates/misc/configfiles/ubuntu_hardy/awstats/etc_cron.d_awstats_log_sql
View File

@@ -1,6 +0,0 @@
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
45 0 * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

19
templates/misc/configfiles/ubuntu_hardy/awstats/etc_lighttpd_froxlor-awstats.conf
View File

@@ -1,19 +0,0 @@
#alias.url += (
# "/js/awstats_misc_tracker.js" => "/usr/share/awstats/wwwroot/js/awstats_misc_tracker.js"
#)
$HTTP["url"] =~ "^/awstats" {
alias.url += (
"/awstats/" => "<AWSTATS_PATH>",
"/awstats" => "<AWSTATS_PATH>awstats.pl",
"/awstats.pl" => "<AWSTATS_PATH>awstats.pl"
# "/awstatsicons/" => "/usr/share/awstats/wwwroot/icon/"
)
index-file.names = ( "awstatstotals.php" )
cgi.assign = (
".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl"
)
}