diff --git a/webalizer/config b/webalizer/config index b6c652a15..db8490716 100644 --- a/webalizer/config +++ b/webalizer/config @@ -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 diff --git a/webalizer/config-*-linux b/webalizer/config-*-linux index 2487908d2..20f03aa47 100644 --- a/webalizer/config-*-linux +++ b/webalizer/config-*-linux @@ -2,3 +2,4 @@ webalizer=webalizer webalizer_conf=/etc/webalizer.conf auto=apache,squid,proftpd,wuftpd naked=0 +skip_old=0 diff --git a/webalizer/config-debian-linux-4.0-* b/webalizer/config-debian-linux-4.0-* index 682bd4c61..522366660 100644 --- a/webalizer/config-debian-linux-4.0-* +++ b/webalizer/config-debian-linux-4.0-* @@ -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 diff --git a/webalizer/config-freebsd b/webalizer/config-freebsd index def9da91a..ac7163442 100644 --- a/webalizer/config-freebsd +++ b/webalizer/config-freebsd @@ -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 diff --git a/webalizer/config-gentoo-linux b/webalizer/config-gentoo-linux index 2487908d2..20f03aa47 100644 --- a/webalizer/config-gentoo-linux +++ b/webalizer/config-gentoo-linux @@ -2,3 +2,4 @@ webalizer=webalizer webalizer_conf=/etc/webalizer.conf auto=apache,squid,proftpd,wuftpd naked=0 +skip_old=0 diff --git a/webalizer/config-mandrake-linux-10.3-* b/webalizer/config-mandrake-linux-10.3-* index 2487908d2..20f03aa47 100644 --- a/webalizer/config-mandrake-linux-10.3-* +++ b/webalizer/config-mandrake-linux-10.3-* @@ -2,3 +2,4 @@ webalizer=webalizer webalizer_conf=/etc/webalizer.conf auto=apache,squid,proftpd,wuftpd naked=0 +skip_old=0 diff --git a/webalizer/config-netbsd b/webalizer/config-netbsd index e038b1a4b..6ac2de136 100644 --- a/webalizer/config-netbsd +++ b/webalizer/config-netbsd @@ -2,3 +2,4 @@ webalizer=/usr/pkg/bin/webalizer webalizer_conf=/etc/webalizer.conf auto=apache,squid,proftpd,wuftpd naked=0 +skip_old=0 diff --git a/webalizer/config-openbsd b/webalizer/config-openbsd index b902f46dc..0e6f16d99 100644 --- a/webalizer/config-openbsd +++ b/webalizer/config-openbsd @@ -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 diff --git a/webalizer/config-openmamba-linux b/webalizer/config-openmamba-linux index 94a80525a..b22567c9a 100644 --- a/webalizer/config-openmamba-linux +++ b/webalizer/config-openmamba-linux @@ -2,3 +2,4 @@ webalizer=webalizer webalizer_conf=/etc/httpd/webalizer.conf auto=apache,squid,proftpd,wuftpd naked=0 +skip_old=0 diff --git a/webalizer/config-solaris-10-* b/webalizer/config-solaris-10-* index ff4ed1646..ff28c0fa7 100644 --- a/webalizer/config-solaris-10-* +++ b/webalizer/config-solaris-10-* @@ -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 diff --git a/webalizer/config.info b/webalizer/config.info index 2333e5c46..20d995b8e 100644 --- a/webalizer/config.info +++ b/webalizer/config.info @@ -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 diff --git a/webalizer/edit_log.cgi b/webalizer/edit_log.cgi index 0851dda53..2d6c4048d 100755 --- a/webalizer/edit_log.cgi +++ b/webalizer/edit_log.cgi @@ -37,7 +37,7 @@ print " \n"; if (!$in{'new'}) { @all = &all_log_files($in{'file'}); - if (@all > 1) { + if (@all > 1 && !$config{'skip_old'}) { print "