Hello community, here is the log from the commit of package sarg for openSUSE:Factory checked in at Mon May 16 16:36:33 CEST 2011.
-------- --- sarg/sarg.changes 2010-03-08 10:29:16.000000000 +0100 +++ sarg/sarg.changes 2011-02-15 17:37:15.000000000 +0100 @@ -1,0 +2,90 @@ +Tue Feb 8 20:48:47 UTC 2011 - [email protected] + +- Update to 2.3.1: + - Please read ChangeLog with changes from 2.3 at + http://sarg.sourceforge.net/sarg.ChangeLog.txt +- Refresh config patch: + Old: sarg-2.2.7.1-config.patch + New: sarg-2.3.1-config.patch +- Really enabled sarg-php; +- Spec file cleaned with spec-cleaner. + +------------------------------------------------------------------- +Tue Nov 9 15:59:18 UTC 2010 - [email protected] + +- Update conf file to match sarg 2.2.7.1 + +------------------------------------------------------------------- +Tue Nov 9 14:40:37 UTC 2010 - [email protected] + +- Conf file appears to have been word wrapped by mistake. Fixed + +------------------------------------------------------------------- +Thu Sep 16 21:27:34 UTC 2010 - [email protected] + +- fix build for suse_version < 1130 + o BuildReq: apache2 (/etc/apache2/conf.d) + +------------------------------------------------------------------- +Wed Sep 15 08:06:21 UTC 2010 - [email protected] + +- Remove obsolete patches +- Add english to sarg-report +- Add suse logo to report index +- Improved default config +- Add apache configuration +- Version 2.2.7 + * Extra compile and run time protection (FORTIFY_SOURCE) fixed + in configure. + * Use tabulations as columns separator in intermediary files + to avoid problems when a field of the log contains a space. + * Input log file type detection partly rewritten to clearly + distinguish which type is processed where. + * Read the input log file from standard input if log file name + is -. + * Use string pointers in getword instead of copying the + strings over and over. + * Use LC_TIME to format some dates and times in the report + according to the selected locale. + * Sarg.conf can list up to 255 access.log files. + * Downloaded files suffixes are matched against a sorted list + and use a dichotomic search. + * Added getword_atoll to read a number directly from a file + without an intermediary string storage. + * Use boolean to enable the options instead of string + compares. + * Accept an absolute path for the language file in sarg.conf. + * Experimental: Can show the backtrace of the program when a + getword loop is detected to help in locating the origin of + the error. + * Protect the creation of the index against invalid + directories. + * Only copy the files (not the subdirs) when creating the + directory with the images to include in the reports. + * Directories deleted without using the rm system command. + * Index created using an internal sort algorithm instead of a + system call. + * Fixed Debian bug #408577 (changed exclude_hosts to exclude + subdomains and IPv4 subnets). + * Replace --enable-htmldir by --enable-sargphp to avoid + confusion on the name (thanks to Peter Nixon). + * Installation of sarg-php can be disabled with + --disable-sargphp. + * Fixed empty entries in squidGuard log when the URL doesn't + start with protocol://. + * Fixed regressions in creation and reading of a sarg parsed + log (thanks to Joao Alves). + * Does not report URLs consisting of only a host name ending + with .com as a downloaded file. + * Mangle the $ and @ signs in user ID to make the resulting + file name valid in shell commands. + * Fixed a regression in the default value of --enable-sargphp. + * Increase the maximum size of a line read from access.log and + detect longer lines that were silently splitted in previous + versions. + * Tolerate longer URLs during the reading of the access.log to + have less chances of aborting during that phase. It only + helps if short URLs are output in the reports. If long_url is set, sarg will + still abort on over sized URLs. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sarg-2.2.3.1-config.patch sarg-2.2.5-enlarge_log_buffer.patch sarg-2.2.5-enlarge_report_buffers.patch sarg-2.2.5-fdleak.patch sarg-2.2.5-getword_boundary_limit.patch sarg-2.2.5-limit_sprintf.patch sarg-2.2.5-limit_useragent_sprintf.patch sarg-2.2.5-too_small_font_buffer.patch sarg-2.2.5-year_assertion.patch sarg-2.2.5.tar.bz2 New: ---- platform_suse.gif sarg-2.3.1-config.patch sarg-2.3.1.tar.bz2 sarg-apache.conf sarg-reports-english.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sarg.spec ++++++ --- /var/tmp/diff_new_pack.YrIwIi/_old 2011-05-16 16:33:33.000000000 +0200 +++ /var/tmp/diff_new_pack.YrIwIi/_new 2011-05-16 16:33:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sarg (Version 2.2.5) +# spec file for package sarg # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: sarg -Summary: Squid Analysis Report Generator -Version: 2.2.5 -Release: 47 +Version: 2.3.1 +Release: 1 License: GPLv2+ +Summary: Squid Analysis Report Generator Url: http://sarg.sourceforge.net/sarg.php Group: Productivity/Networking/Web/Utilities -%if 0%{?suse_version} >= 1010 -Recommends: http_proxy cron -%endif -AutoReqProv: on -PreReq: %fillup_prereq -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://web.onda.com.br/orso/%{name}-%{version}.tar.bz2 Source1: sarg.conf Source2: http://www.initzero.it/products/opensource/sarg-reports/download/sarg-reports @@ -40,17 +33,24 @@ Source6: cron.weekly.sarg Source7: cron.monthly.sarg Source8: sarg-reports.1.gz +Source9: sarg-apache.conf +Source10: platform_suse.gif # Patch0: http://sarg.sourceforge.net/sarg-2.0.1-largeurl.patch.gz -Patch0: sarg-2.2.3.1-config.patch +# PATCH-FIX-UPSTREAM sarg-2.3.1-config.patch +Patch0: sarg-2.3.1-config.patch +# PATCH-FIX-UPSTREAM sarg-2.2.3.1-description.patch Patch1: sarg-2.2.3.1-description.patch -Patch2: sarg-2.2.5-getword_boundary_limit.patch -Patch3: sarg-2.2.5-enlarge_report_buffers.patch -Patch4: sarg-2.2.5-too_small_font_buffer.patch -Patch5: sarg-2.2.5-enlarge_log_buffer.patch -Patch6: sarg-2.2.5-limit_sprintf.patch -Patch7: sarg-2.2.5-limit_useragent_sprintf.patch -Patch8: sarg-2.2.5-year_assertion.patch -Patch9: sarg-2.2.5-fdleak.patch +# PATCH-FIX-UPSTREAM sarg-reports-english.patch +Patch10: sarg-reports-english.patch +PreReq: %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{suse_version} +BuildRequires: apache2 +%endif +%if 0%{?suse_version} >= 1010 +Recommends: cron +Recommends: http_proxy +%endif %description Sarg -- Squid Analysis Report Generator is a tool that allows you to @@ -59,85 +59,68 @@ sites, and times. %prep -%setup -%patch0 -p1 +%setup -q +%patch0 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 +patch %{SOURCE2} < %{PATCH10} %build %{?suse_update_config:%{suse_update_config -f cfgaux}} -CFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=/usr \ - --enable-bindir=%{_bindir} \ - --enable-sysconfdir=%{_datadir}/%{name} \ - --enable-htmldir=/srv/www/htdocs \ - --enable-mandir=%{_mandir}/man1 -make -# --------------------------------------------------------------------------- +%configure \ + --sysconfdir=%{_datadir}/%{name} \ + --mandir=%{_mandir}/man1 \ + --localedir=%{_datadir}/sarg/languages \ + --enable-sargphp=/srv/www/htdocs +%{__make} %install -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_datadir} -mkdir -p $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ -make \ - BINDIR=$RPM_BUILD_ROOT/%{_bindir} \ - SYSCONFDIR=$RPM_BUILD_ROOT/%{_datadir}/%{name} \ - MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \ - install -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sarg.conf -ln -sf ../../../etc/sarg.conf $RPM_BUILD_ROOT/%{_datadir}/%{name}/sarg.conf -chmod a-x CONTRIBUTORS COPYING ChangeLog DONATIONS LICENSE README -chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man1/* -chmod a-x $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-php/locale/*/LC_MESSAGES/* -# might be temporary, please remove in next version: -rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/languages/.new -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -install -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_sbindir} -install -m 644 %SOURCE3 $RPM_BUILD_ROOT/%{_datadir}/%{name}/sarg.hosts -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT/etc/cron.daily -install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.daily/suse.de-sarg -mkdir -p $RPM_BUILD_ROOT/etc/cron.weekly -install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.weekly/suse.de-sarg -mkdir -p $RPM_BUILD_ROOT/etc/cron.monthly -install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/etc/cron.monthly/suse.de-sarg -install -d -m755 $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m644 %{SOURCE8} $RPM_BUILD_ROOT/%{_mandir}/man8 -# --------------------------------------------------------------------------- +%{__install} -d %{buildroot}/srv/www/htdocs +%makeinstall +%{__install} -d %{buildroot}%{_sysconfdir}/apache2/conf.d +%{__install} -d %{buildroot}/srv/www/sarg +%{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sarg.conf +%{__install} -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/apache2/conf.d/ +%{__install} -m 644 %{SOURCE10} %{buildroot}/srv/www/sarg/ +%{__ln_s} -f ../../../etc/sarg.conf %{buildroot}%{_datadir}/%{name}/sarg.conf +%{__install} -d %{buildroot}%{_sbindir} +%{__install} -m 755 %{SOURCE2} %{buildroot}%{_sbindir} +%{__install} -m 644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/sarg.hosts +%{__install} -d %{buildroot}%{_localstatedir}/adm/fillup-templates +%{__install} -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates +%{__install} -D -m 755 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.daily/suse.de-sarg +%{__install} -D -m 755 %{SOURCE6} %{buildroot}%{_sysconfdir}/cron.weekly/suse.de-sarg +%{__install} -D -m 755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.monthly/suse.de-sarg +%{__install} -d -m 755 %{buildroot}%{_mandir}/man8 +%{__install} -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man8 %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %post %{fillup_only -n sarg} %files -%defattr(-, root, root) -%config(noreplace) /etc/sarg.conf -/etc/cron.*/suse.de-sarg +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/sarg.conf +%{_sysconfdir}/cron.*/suse.de-sarg +%config(noreplace) %{_sysconfdir}/apache2/conf.d/sarg-apache.conf %{_bindir}/sarg %{_sbindir}/sarg-reports %dir %{_datadir}/%{name} +%dir /srv/www/sarg +/srv/www/sarg/platform_suse.gif %{_datadir}/%{name}/css.tpl -%{_datadir}/%{name}/fonts -%{_datadir}/%{name}/images -%{_datadir}/%{name}/sarg-php %{_datadir}/%{name}/exclude_codes -%{_datadir}/%{name}/languages %{_datadir}/%{name}/sarg.conf %{_datadir}/%{name}/sarg.hosts %{_datadir}/%{name}/user_limit_block -/var/adm/fillup-templates/sysconfig.sarg +%{_datadir}/%{name}/languages +%{_datadir}/%{name}/fonts +%{_datadir}/%{name}/images +%{_localstatedir}/adm/fillup-templates/sysconfig.sarg + +%defattr(0644,root,root,0755) +/srv/www/htdocs/sarg-php %doc %{_mandir}/man1/%{name}* %doc %{_mandir}/man8/%{name}-report* %doc CONTRIBUTORS COPYING ChangeLog DONATIONS LICENSE README ++++++ sarg-2.2.3.1-config.patch -> sarg-2.3.1-config.patch ++++++ --- sarg/sarg-2.2.3.1-config.patch 2007-12-05 16:48:35.000000000 +0100 +++ sarg/sarg-2.3.1-config.patch 2011-02-08 23:58:22.000000000 +0100 @@ -1,16 +1,48 @@ ---- sarg-2.2.3.1/sarg-php/sarg-block-it.php.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/sarg-php/sarg-block-it.php 2007-12-05 16:17:14.000000000 +0100 +Index: htaccess +=================================================================== +--- htaccess.orig ++++ htaccess +@@ -1,4 +1,4 @@ +-AuthUserFile /usr/local/sarg/passwd ++AuthUserFile /usr/share/sarg/passwd + AuthName "SARG, Squid Analysis Report Generator" + AuthType Basic + <Limit GET POST> +Index: sarg.1 +=================================================================== +--- sarg.1.orig ++++ sarg.1 +@@ -162,11 +162,11 @@ Writes debug messages to \fBSTDOUT\fP + .B \-z + Writes messages on processes to \fBSTDOUT\fP + .SH FILES +-.BR /usr/local/sarg/sarg.conf ++.BR /etc/sarg.conf + .br + .B /var/log/squid/access.log + .br +-.B /usr/local/squidGuard/logs/squidGuard.log ++.B /var/log/squidGuard/squidGuard.log + .SH SEE ALSO + squid(8) + .SH AUTHOR +Index: sarg-php/sarg-block-it.php +=================================================================== +--- sarg-php/sarg-block-it.php.orig ++++ sarg-php/sarg-block-it.php @@ -25,7 +25,7 @@ * */ -$filename = "/usr/local/squid/etc/block.txt"; -+$filename = "/etc/squid/etc/block.txt"; ++$filename = "/etc/squid/block.txt"; $url = $_GET['url']; $url = $url."\n"; ---- sarg-2.2.3.1/sarg-php/sarg-squidguard-block.php.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/sarg-php/sarg-squidguard-block.php 2007-12-05 16:16:14.000000000 +0100 +Index: sarg-php/sarg-squidguard-block.php +=================================================================== +--- sarg-php/sarg-squidguard-block.php.orig ++++ sarg-php/sarg-squidguard-block.php @@ -26,8 +26,8 @@ */ @@ -22,7 +54,7 @@ global $SargConf; global $dbhome; -@@ -37,7 +37,7 @@ +@@ -37,7 +37,7 @@ include_once("language.php"); include_once("style.php"); $url = $_GET['url']; @@ -31,45 +63,10 @@ function parse_config($line,$clave) { if (preg_match("/dbhome/i", $line)) { ---- sarg-2.2.3.1/sarg.1.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/sarg.1 2007-12-05 16:37:19.000000000 +0100 -@@ -131,11 +131,11 @@ - .B \-split - Split the log file by date in \fB-d\fP parameter. - .SH FILES --.BR /usr/local/sarg/sarg.conf -+.BR /etc/sarg.conf - .br --.B /usr/local/squid/logs/access.log -+.B /var/log/squid/access.log - .br --.B /usr/local/squidGuard/logs/squidGuard.log -+.B /var/log/squidGuard/squidGuard.log - .SH SEE ALSO - squid(8) - .SH AUTHOR ---- sarg-2.2.3.1/log.c.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/log.c 2007-12-05 16:38:33.000000000 +0100 -@@ -145,7 +145,7 @@ int main(argc,argv) - SquidGuardLogAlternate[0]='\0'; - arq[0]='\0'; - -- strcpy(AccessLog,"/usr/local/squid/var/logs/access.log"); -+ strcpy(AccessLog,"/var/log/squid/access.log"); - sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR); - strcpy(GraphDaysBytesBarColor,"orange"); - strcpy(BgColor,"#ffffff"); -@@ -201,7 +201,7 @@ int main(argc,argv) - strcpy(DisplayedValues,"abbreviation"); - strcpy(HeaderFontSize,"9px"); - strcpy(TitleFontSize,"11px"); -- strcpy(AuthUserFile,"/usr/local/sarg/passwd"); -+ strcpy(AuthUserFile,"/usr/share/sarg/passwd"); - strcpy(AuthName,"SARG, Restricted Access"); - strcpy(AuthType,"basic"); - strcpy(Require,"require user admin %u"); ---- sarg-2.2.3.1/user_limit_block.orig 2007-01-02 20:13:14.000000000 +0100 -+++ sarg-2.2.3.1/user_limit_block 2007-12-05 16:40:00.000000000 +0100 +Index: user_limit_block +=================================================================== +--- user_limit_block.orig ++++ user_limit_block @@ -24,8 +24,8 @@ # # @@ -81,73 +78,3 @@ tmp="/tmp/sarg_limit.$$" limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'` ---- sarg-2.2.3.1/README.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/README 2007-12-05 16:40:28.000000000 +0100 -@@ -50,20 +50,20 @@ If you use native squid log format, the - default: /usr/bin - - --enable-sysconfdir - where the configuration directory is -- default: /usr/local/sarg -+ default: /usr/share/sarg - - --enable-htmldir - where the www html root dir is - default: /var/www/html - - --enable-mandir - where the sarg man page will be saved -- default: /usr/local/man/man1 -+ default: /usr/share/man/man1 - - - 3. make - - 4. make install - --5. Go to /usr/local/sarg (or file entered with --sysconfdir on configure) -+5. Go to /usr/share/sarg (or file entered with --sysconfdir on configure) - and change sarg.conf as you need. - - 6. Notes about sarg: ---- sarg-2.2.3.1/splitlog.c.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/splitlog.c 2007-12-05 16:40:49.000000000 +0100 -@@ -39,7 +39,7 @@ void splitlog(char *arq, char *df, int d - struct tm *t; - - if(arq[0] == '\0') -- strcpy(arq,"/usr/local/squid/logs/access.log"); -+ strcpy(arq,"/var/log/squid/access.log"); - - if((fp_in=fopen(arq,"r"))==NULL) { - fprintf(stderr, "SARG: (splitlog) %s: %s\n",text[8],arq); ---- sarg-2.2.3.1/htaccess.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/htaccess 2007-12-05 16:41:20.000000000 +0100 -@@ -1,4 +1,4 @@ --AuthUserFile /usr/local/sarg/passwd -+AuthUserFile /usr/share/sarg/passwd - AuthName "SARG, Squid Analysis Report Generator" - AuthType Basic - <Limit GET POST> ---- sarg-2.2.3.1/convlog.c.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/convlog.c 2007-12-05 16:41:35.000000000 +0100 -@@ -39,7 +39,7 @@ void convlog(char *arq, char *df, int df - struct tm *t; - - if(arq[0] == '\0') -- strcpy(arq,"/usr/local/squid/logs/access.log"); -+ strcpy(arq,"/usr/log/squid/access.log"); - - if((fp_in=fopen(arq,"r"))==NULL) { - fprintf(stderr, "SARG: (convlog) %s: %s\n",text[8],arq); ---- sarg-2.2.3.1/sarg-php/INSTALL.orig 2007-01-02 20:11:26.000000000 +0100 -+++ sarg-2.2.3.1/sarg-php/INSTALL 2007-12-05 16:42:59.000000000 +0100 -@@ -2,8 +2,8 @@ - To use sarg-squidGuard you need to change: - - 1. These two variables on sarg-squidguard-block.php file: --$SargConf = "/usr/local/sarg/sarg.conf"; --$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf"; -+$SargConf = "/etc/sarg.conf"; -+$squidGuardConf = "/etc/squidGuard.conf"; - - 2.change the squidGuard db file to the same httpd process owner: --chown apache /var/www/html/sarg-php -+chown apache /srv/www/htdocs/sarg-php ++++++ sarg-2.2.5.tar.bz2 -> sarg-2.3.1.tar.bz2 ++++++ ++++ 111716 lines of diff (skipped) ++++++ sarg-apache.conf ++++++ Alias /sarg /srv/www/sarg <Directory /srv/www/sarg> DirectoryIndex index.html Order allow,deny Allow from all </Directory> ++++++ sarg-reports-english.patch ++++++ --- sarg-reports-old 2007-12-05 21:18:36.000000000 +0530 +++ sarg-reports 2010-09-15 12:43:54.000000000 +0530 @@ -88,17 +88,32 @@ #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ## Italian Language +# SARG=/usr/bin/sarg +# CONFIG=/etc/sarg/sarg.conf +# HTMLOUT=/var/www/html/admin/log/proxy +# PAGETITLE="Statistiche Proxy di $(hostname)" +# LOGOIMG=http://www.initzero.it/images/initzero-logo.jpg +# LOGOLINK=http://www.initzero.it +# DAILY=Giornaliero +# WEEKLY=Settimanale +# MONTHLY=Mensile +#EXCLUDELOG1="SARG: Nessun records trovato." +#EXCLUDELOG2="SARG: Fine" +#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + +#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +## English Language SARG=/usr/bin/sarg - CONFIG=/etc/sarg/sarg.conf - HTMLOUT=/var/www/html/admin/log/proxy - PAGETITLE="Statistiche Proxy di $(hostname)" - LOGOIMG=http://www.initzero.it/images/initzero-logo.jpg - LOGOLINK=http://www.initzero.it - DAILY=Giornaliero - WEEKLY=Settimanale - MONTHLY=Mensile -EXCLUDELOG1="SARG: Nessun records trovato." -EXCLUDELOG2="SARG: Fine" + CONFIG=/etc/sarg.conf + HTMLOUT=/srv/www/sarg + PAGETITLE="Proxy report of $(hostname)" + LOGOIMG=/sarg/platform_suse.gif + LOGOLINK= + DAILY=Daily + WEEKLY=Weekly + MONTHLY=Monthly +#EXCLUDELOG1="SARG: Nessun records trovato." +#EXCLUDELOG2="SARG: Fine" #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ++++++ sarg.conf ++++++ --- /var/tmp/diff_new_pack.YrIwIi/_old 2011-05-16 16:33:33.000000000 +0200 +++ /var/tmp/diff_new_pack.YrIwIi/_new 2011-05-16 16:33:33.000000000 +0200 @@ -3,11 +3,14 @@ # TAG: language # Available languages: # Bulgarian_windows1251 +# Catalan # Czech +# Czech_UTF8 # Dutch # English # French # German +# Greek # Hungarian # Indonesian # Italian @@ -17,8 +20,10 @@ # Portuguese # Romanian # Russian_koi8 +# Russian_UTF-8 # Russian_windows1251 # Serbian +# Slovak # Spanish # Turkish # @@ -53,13 +58,17 @@ #header_bgcolor blanchedalmond # TAG: font_size -# TAG: font_size -# Especify the font size +# Especify the text font size +# +#font_size 9px + +# TAG: header_font_size +# Especify the header font size # #header_font_size 9px -# TAG: title_font_size -# Especify the title font size +# TAG: title_font_size +# Especify the title font size # #title_font_size 11px @@ -67,17 +76,17 @@ # TAG: background_color # Html page background color # -#background_color white +# background_color white # TAG: text_color # Html page text color # -#text_color black +#text_color #000000 # TAG: text_bgcolor # Html page text background color # -#text_bgcolor beige +#text_bgcolor lavender # TAG: title_color # Html page title color @@ -97,7 +106,7 @@ # TAG: logo_text_color # Html page logo texti color. # -#logo_text_color black +#logo_text_color #000000 # TAG: logo_image_size # Html page logo image size. @@ -111,27 +120,27 @@ #background_image none # TAG: password -# User password file used by authentication -# If you put here, reports will be generated only for users in. +# User password file used by Squid authentication scheme +# If used, generate reports just for that users. # #password none # TAG: temporary_dir -# Temporary directory name +# Temporary directory name for work files # sarg -w dir # #temporary_dir /tmp # TAG: output_dir -# Where is the reports will ne stored. +# The reports will be saved in that directory # sarg -o dir # #output_dir /usr/local/etc/httpd/htdocs/squid-reports #output_dir /home/httpd/html/squid-reports # RedHat version -output_dir /srv/www/htdocs/squid-reports +output_dir /srv/www/sarg # TAG: output_email -# Email address to send the reports +# Email address to send the reports. If you use this tag, no html reports will be generated. # sarg -e email # #output_email none @@ -142,7 +151,7 @@ #resolve_ip no # TAG: user_ip yes/no -# Use Ip Address instead userid (reports) +# Use Ip Address instead userid in reports. # sarg -p #user_ip no @@ -168,25 +177,27 @@ # TAG: exclude_hosts file # Hosts, domains or subnets will be excluded from reports. # -# Eg.: 192.168.10.10 - exclude ip address only -# 192.168.10.0 - exclude full C class -# s1.acme.foo - exclude hostname only -# acme.foo - exclude full domain name +# Eg.: 192.168.10.10 - exclude ip address only +# 192.168.10.0/24 - exclude full C class +# s1.acme.foo - exclude hostname only +# *.acme.foo - exclude full domain name # #exclude_hosts /etc/squid/sarg.hosts #exclude_hosts none # TAG: useragent_log file -# Put here where is useragent.log to nable useragent report. +# useragent.log file patch to generate useragent report. # #useragent_log none # TAG: date_format -# Date format in reports: e (Europe=dd/mm/yy), u (USA=mm/dd/yy), w (Weekly=yy.ww) +# Date format in reports: e (European=dd/mm/yy), u (American=mm/dd/yy), w (Weekly=yy.ww) +# #date_format u # TAG: per_user_limit file MB -# Save userid on file if download exceed n MB. +# Saves userid on file if download exceed n MB. +# This option allow you to disable user access if user exceed a download limit. # # This option can be used to disable user access if user exceed a download limit. #per_user_limit none @@ -209,6 +220,11 @@ # #index yes +# TAG: index_tree date|file +# How to generate the index. +# +#index_tree file + # TAG: overwrite_report yes|no # yes - if report date already exist then will be overwrited. # no - if report date already exist then will be renamed to filename.n, filename.n+1 @@ -254,7 +270,7 @@ # TAG: exclude_codes file # Ignore records with these codes. Eg.: NONE/400 # -#exclude_codes /usr/share/sarg/exclude_codes +exclude_codes /usr/share/sarg/exclude_codes # TAG: replace_index string # Replace "index.html" in the main index file with this string @@ -272,19 +288,22 @@ # TAG: report_type type # What kind of reports to generate. -# topsites - shows the site, connect and bytes -# sites_users - shows which users were accessing a site -# users_sites - shows sites accessed by the user -# date_time - shows the amount of bytes used by day and hour -# denied - show all denied sites with full URL -# auth_failures - show autentication failures +# topusers - users, sites, times, bytes, connects, links to accessed sites, etc +# topsites - site, connect and bytes report +# sites_users - users and sites report +# users_sites - accessed sites by the user report +# date_time - bytes used per day and hour report +# denied - denied sites with full URL report +# auth_failures - autentication failures report +# site_user_time_date - sites, dates, times and bytes report +# downloads - downloads per user report # # Eg.: report_type topsites denied # -#report_type topsites users_sites sites_users date_time denied auth_failures site_user_time_date +#report_type topusers topsites sites_users users_sites date_time denied auth_failures site_user_time_date downloads # TAG: usertab filename -# You can change the "userid" or the "ip address" to be a real user name on the rpeorts. +# You can change the "userid" or the "ip address" to be a real user name on the reports. # Table syntax: # userid name or ip address name # Eg: @@ -307,7 +326,7 @@ # TAG: date_time_by bytes|elap # Date/Time reports will use bytes or elapsed time? # -#date_time_by bytes +#date_time_by elap # TAG: charset name # ISO 8859 is a full series of 10 standardized multilingual single-byte coded (8bit) @@ -324,7 +343,9 @@ # Latin5 - Turkish # Latin6 # Windows-1251 +# Japan # Koi8-r +# UTF-8 # #charset Latin1 @@ -355,7 +376,7 @@ #exclude_string none # TAG: show_successful_message yes|no -# Show "Successful report generated on dir" at end of process. +# Shows "Successful report generated on dir" at end of process. # show_successful_message no @@ -369,16 +390,21 @@ # #topuser_fields NUM DATE_TIME USERID CONNECT BYTES %BYTES IN-CACHE-OUT USED_TIME MILISEC %TIME TOTAL AVERAGE +# TAG: user_report_fields +# Which fields must be in User report. +# +#user_report_fields CONNECT BYTES %BYTES IN-CACHE-OUT USED_TIME MILISEC %TIME TOTAL AVERAGE + +# TAG: bytes_in_sites_users_report yes|no +# Bytes field must be in Site & Users Report ? +# +#bytes_in_sites_users_report no + # TAG: topuser_num n # How many users in topsites report. 0 = no limit # #topuser_num 0 -# TAG: site_user_time_date_type list|table -# generate reports for site_user_time_date in list or table format -# -#site_user_time_date_type table - # TAG: datafile file # Save the report results in a file to populate some database # @@ -395,6 +421,11 @@ # #datafile_fields user;date;time;url;connect;bytes;in_cache;out_cache;elapsed +# TAG: datafile_url ip|name +# Saves the URL as ip or name in datafile +# +#datafile ip + # TAG: weekdays # The weekdays to take account ( Sunday->0, Saturday->6 ) # Example: @@ -409,6 +440,20 @@ # Default: #hours 0-23 +# TAG: dansguardian_conf file +# DansGuardian.conf file path +# Generate reports from DansGuardian logs. +# Use 'none' to disable it. +# dansguardian_conf /usr/dansguardian/dansguardian.conf +# +#dansguardian_conf none + +# TAG: dansguardian_ignore_date on|off +# 'on' must use the record even the date range is different from the used in squid access.log file. +# 'off' must use the record only if the date range is in the irange used in squid access.log file. +# +#dansguardian_ignore_date off + # TAG: squidguard_conf file # path to squidGuard.conf file # Generate reports from SquidGuard logs. @@ -419,17 +464,14 @@ #squidguard_conf none # TAG: squidguard_ignore_date on|off -# Use 'on' use the record even the date range is different from -# the used squid access.log file. -# Use 'off' use the record only if the date range is in the used -# squid access.log file. +# Use 'on' use the record even the date range is different from the used squid access.log file. +# Use 'off' use the record only if the date range is in the used squid access.log file. # #squidguard_ignore_date off # TAG: squidguard_log_format # Format string SquidGuard logs. -# REJIK #year#-#mon#-#day# #hour# #list#:#tmp# #ip# #user# #tmp#/#tm -#/#url#/#end# +# REJIK #year#-#mon#-#day# #hour# #list#:#tmp# #ip# #user# #tmp#/#tmp#/#url#/#end# # SQUIDGUARD #year#-#mon#-#day# #hour# #tmp#/#list#/#tmp#/#tmp#/#url#/#tmp# #ip#/#tmp# #user# #end# #squidguard_log_format #year#-#mon#-#day# #hour# #tmp#/#list#/#tmp#/#tmp#/#url#/#tmp# #ip#/#tmp# #user# #end# @@ -446,20 +488,22 @@ # TAG: parsed_output_log directory # Saves the processed log in a sarg format after parsing the squid log file. # This is a way to dump all of the data structures out, after parsing from -# the logs (presumably this data will be much smaller than the log files t -emselves), +# the logs (presumably this data will be much smaller than the log files themselves), # and pull them back in for later processing and merging with data from previous logs. # #parsed_output_log none # TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress -# sarg logs compress util +# Command to run to compress sarg parsed output log. It may contain +# options (such as -f to overwrite existing target file). The name of +# the file to compresse is provided at the end of this +# command line. Don't forget to quote things appropriately. # #parsed_output_log_compress /bin/gzip # TAG: displayed_values bytes|abbreviation # how the values will be displayed in reports. -# eg. bytes - 209.526 +# eg. bytes - 209.526 # abbreviation - 210K # #displayed_values bytes @@ -505,16 +549,16 @@ # TAG: external_css_file path # This tag allow internal sarg css override. # Sarg use theses style classes: -# .body body class -# .info sarg information class, align=center -# .title title class, align=center -# .header header class, align:left -# .header2 header class, align:right -# .header3 header class, align:right -# .text text class, align:left -# .data table text class, align:right -# .data2 table text class, align:right, border colors -# .link link class +# .body body class +# .info sarg information class, align=center +# .title title class, align=center +# .header header class, align:left +# .header2 header class, align:right +# .header3 header class, align:right +# .text text class, align:left +# .data table text class, align:right +# .data2 table text class, align:right, border colors +# .link link class # # There is a sample in /usr/local/sarg/etc/css.tpl # @@ -523,10 +567,10 @@ # TAG: user_authentication yes|no # Allow user authentication in User Reports using .htaccess # Parameters: -# AuthUserFile - where the user password file is -# AuthName - authentication realm. Eg "Members Only" -# AuthType - authenticaion type - basic -# Require - authorized users to see the report. +# AuthUserFile - where the user password file is +# AuthName - authentication realm. Eg "Members Only" +# AuthType - authenticaion type - basic +# Require - authorized users to see the report. # %u - user report # # user_authentication no @@ -544,6 +588,7 @@ # TAG: ulimit n # The maximum number of open file descriptors to avoid "Too many open files" error message. # You need to run sarg as root to use ulimit tag. +# If you run sarg with a low privilege user, set to 'none' to disable ulimit # #ulimit 20000 @@ -571,7 +616,7 @@ # TAG: realtime_unauthenticated_records: ignore|show # What to do with unauthenticated records in realtime report. # -# realtime_unauthenticated_records: ignore +# realtime_unauthenticated_records: show # TAG: byte_cost value no_cost_limit # Cost per byte. @@ -581,3 +626,8 @@ # 0 = disable # # byte_cost 0.01 50000000 + +# TAG: squid24 on|off +# Compatilibity with squid version <= 2.4 when using emulate_http_log on +# +# squid24 off ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
