VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add config option to skip rotated logs

Browse Source
This commit is contained in:
Jamie Cameron
2014-02-28 20:22:17 -08:00
parent 9d830ae725
commit f7d06b0748
14 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webalizer/config
View File

@ -3,3 +3,4 @@ webalizer_conf=/etc/webalizer.conf
alt_conf=/etc/webalizer.conf.sample
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-*-linux
View File

@ -2,3 +2,4 @@ webalizer=webalizer
webalizer_conf=/etc/webalizer.conf
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-debian-linux-4.0-*
View File

@ -3,3 +3,4 @@ webalizer_conf=/etc/webalizer/webalizer.conf
alt_conf=/etc/webalizer/webalizer.conf.sample
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-freebsd
View File

@ -3,3 +3,4 @@ webalizer_conf=/usr/local/etc/webalizer.conf
alt_conf=/usr/local/etc/webalizer.conf-dist
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-gentoo-linux
View File

@ -2,3 +2,4 @@ webalizer=webalizer
webalizer_conf=/etc/webalizer.conf
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-mandrake-linux-10.3-*
View File

@ -2,3 +2,4 @@ webalizer=webalizer
webalizer_conf=/etc/webalizer.conf
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-netbsd
View File

@ -2,3 +2,4 @@ webalizer=/usr/pkg/bin/webalizer
webalizer_conf=/etc/webalizer.conf
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-openbsd
View File

@ -3,3 +3,4 @@ webalizer_conf=/etc/webalizer.conf
alt_conf=/usr/local/share/examples/webalizer/sample.conf
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-openmamba-linux
View File

@ -2,3 +2,4 @@ webalizer=webalizer
webalizer_conf=/etc/httpd/webalizer.conf
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config-solaris-10-*
View File

@ -3,3 +3,4 @@ webalizer_conf=/opt/csw/etc/webalizer.conf
alt_conf=/opt/csw/etc/webalizer.conf.CSWapache
auto=apache,squid,proftpd,wuftpd
naked=0
skip_old=0

1
webalizer/config.info
View File

@ -1,6 +1,7 @@
line1=Configurable options,11
auto=Automatically include logfiles from,2,apache-Apache,squid-Squid,proftpd-ProFTPd,wuftpd-WUFTPd
naked=Add Webmin header and footer to Webalizer report?,1,0-Yes,1-No
skip_old=Include old rotated log files?,1,0-Yes,1-No
line2=System configuration,11
webalizer=Path to webalizer command,0
webalizer_conf=Path to webalizer configuration file,0

2
webalizer/edit_log.cgi
View File

@ -37,7 +37,7 @@ print "</td> </tr>\n";
if (!$in{'new'}) {
@all = &all_log_files($in{'file'});
if (@all > 1) {
if (@all > 1 && !$config{'skip_old'}) {
print "<tr> <td valign=top><b>$text{'edit_files'}</b></td> ",
"<td colspan=3><font size=-1>\n";
foreach $a (@all) {

2
webalizer/webalizer-lib.pl
View File

@ -160,7 +160,7 @@ sub generate_report
{
local $h = $_[1];
local $lconf = &get_log_config($_[0]);
local @all = &all_log_files($_[0]);
local @all = $config{'skip_old'} ? ( $_[0] ) : &all_log_files($_[0]);
if (!@all) {
print $h "Log file $_[0] does not exist\n";
return;

3
webalizer/webalizer.pl
View File

@ -15,7 +15,8 @@ close(NULL);
if ($ok && $lconf->{'clear'}) {
# Truncate or delete the files for this report
foreach $f (&all_log_files($ARGV[0])) {
@files = $config{'skip_old'} ? ( $ARGV[0] ) : &all_log_files($ARGV[0]);
foreach $f (@files) {
next if (!-r $f);
if ($f eq $ARGV[0]) {
# Just truncate the main log file