diff -Naur awffull-3.10.1/doc/awffull.1 awffull-3.10.1.oden/doc/awffull.1 --- awffull-3.10.1/doc/awffull.1 2008-11-24 09:49:08.000000000 +0100 +++ awffull-3.10.1.oden/doc/awffull.1 2008-11-24 15:03:36.000000000 +0100 @@ -214,7 +214,7 @@ Once executed, the general flow of the program is: .PP A default configuration file is scanned for, -\*(T<\fI/usr/local/etc/awffull.conf\fR\*(T> and, if found, is +\*(T<\fI/etc/awffull/awffull.conf\fR\*(T> and, if found, is used. .PP Any command line arguments given to the program are parsed. This diff -Naur awffull-3.10.1/doc/awffull.1.xml awffull-3.10.1.oden/doc/awffull.1.xml --- awffull-3.10.1/doc/awffull.1.xml 2008-11-24 09:49:08.000000000 +0100 +++ awffull-3.10.1.oden/doc/awffull.1.xml 2008-11-24 15:03:36.000000000 +0100 @@ -339,7 +339,7 @@ <procedure> <step> <para>A default configuration file is scanned for, - <filename>/usr/local/etc/awffull.conf</filename> and, if found, is + <filename>/etc/awffull/awffull.conf</filename> and, if found, is used.</para> </step> diff -Naur awffull-3.10.1/sample.conf awffull-3.10.1.oden/sample.conf --- awffull-3.10.1/sample.conf 2008-11-24 09:49:36.000000000 +0100 +++ awffull-3.10.1.oden/sample.conf 2008-11-24 15:04:19.000000000 +0100 @@ -1,3 +1,5 @@ +##AWFFULL_LANG=sv_SE.UTF-8 +##AWFFULL_LANGUAGE=sv_SE.UTF-8:sv /* # AWFFull - A Webalizer Fork, Full o' features # @@ -37,7 +39,7 @@ # at least one space or tab between the keyword and its value. # # AWFFull will look for a 'default' configuration file -# "/usr/local/etc/awffull.conf", and if found, use that. +# "/etc/awffull/awffull.conf", and if found, use that. # the '-c config.file' option can also be used to specify an alternate # configuration file. Or multiple configuration files, with multiple -c's. @@ -48,6 +50,7 @@ # be decompressed on the fly as it is being read. #LogFile /var/lib/httpd/logs/access_log +LogFile /var/log/httpd/access_log # LogType defines the log type being processed. Normally, AWFFull # expects a CLF or Combined web server log as input. Using this option, @@ -59,12 +62,14 @@ # you are sending to it. If no joy, AWFFull will immediately exit. #LogType auto +LogType combined # OutputDir is where you want to put the output files. This should # should be a full path name, however relative ones might work as well. # If no output directory is specified, the current directory will be used. #OutputDir . +OutputDir /var/lib/awffull # HistoryName allows you to specify the name of the history file produced # by AWFFull. The history file keeps the data for up to 12 months @@ -75,6 +80,7 @@ # is relative to the output directory, unless absolute (leading /). #HistoryName awffull.hist +HistoryName awffull.hist # Incremental processing allows multiple partial log files to be used # instead of one huge one. Useful for large sites that have to rotate @@ -167,6 +173,7 @@ # to make you own changes to the default file. #CSSFilename awffull.css +CSSFilename awffull.css # UseHTTPS should be used if the analysis is being run on a # secure server, and links to urls should use 'https://' instead @@ -288,6 +295,7 @@ # ie. Don't use GeoIP AND DNSHistory. #GeoIP no +GeoIP yes # GeoIPDatabase is the location of the GeoIP database file. Default is # '/usr/local/share/GeoIP/GeoIP.dat', which is where a default GeoIP @@ -295,12 +303,14 @@ # For the details see: http://www.maxmind.com/app/geoip_country #GeoIPDatabase /usr/local/share/GeoIP/GeoIP.dat +GeoIPDatabase /usr/share/GeoIP/GeoIP.dat # FlagsLocation will enable the display of country flags in the country # table. The path is that for a webserver, not file system. Can be # relative or complete. The trailing slash is not necessary. #FlagsLocation flags +FlagsLocation /flags # DailyGraph and DailyStats allows the daily statistics graph # and statistics table to be disabled (not displayed). Values diff -Naur awffull-3.10.1/sample.minimal.conf awffull-3.10.1.oden/sample.minimal.conf --- awffull-3.10.1/sample.minimal.conf 2008-11-24 09:49:08.000000000 +0100 +++ awffull-3.10.1.oden/sample.minimal.conf 2008-11-24 15:03:36.000000000 +0100 @@ -37,5 +37,5 @@ # If you want to see the country flags, uncomment the following. # This is the, possibly relative, URL where the flag flies are located. -#FlagsLocation flags +FlagsLocation /flags