From 28f9c459667ba941eb2b1ea26e7e50013950249c Mon Sep 17 00:00:00 2001 From: Darrel Herbst Date: Wed, 10 Aug 2022 14:09:45 -0400 Subject: [PATCH] Allow LogSeparator to be modified by env file. --- confs/awstats_env.conf | 2 +- test/sites/README.md | 5 +++-- test/sites/demo.pygeoapi.io-master.env | 1 + test/sites/demo.pygeoapi.io.env | 1 + test/sites/map5.nl.env | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/confs/awstats_env.conf b/confs/awstats_env.conf index 0c80e6f..0fa84de 100644 --- a/confs/awstats_env.conf +++ b/confs/awstats_env.conf @@ -134,7 +134,7 @@ LogFormat="$AWSTATS_CONF_LOGFORMAT" # Example: "," # Default: " " # -LogSeparator=" " +LogSeparator="$AWSTATS_CONF_LOGSEPARATOR" # "SiteDomain" must contain the main domain name, or the main intranet web diff --git a/test/sites/README.md b/test/sites/README.md index e741065..28fa8b6 100644 --- a/test/sites/README.md +++ b/test/sites/README.md @@ -5,17 +5,18 @@ can be placed: * `.env` files, containing only several variables for quick config substituted in [awstats_env.conf](../awstats_env.conf) * complete `.conf` files, containing a complete `awstats` `CONFIGURE FILE 7.3` like [geotracing.com.conf](geotracing.com.conf) -In an `.env` file the following vars can be specified, as example below: +In an `.env` file ALL the following vars must be specified, as example below: ``` AWSTATS_CONF_LOGFILE=/var/local/log/map5.nl/map5.nl-access.log AWSTATS_CONF_LOGFORMAT="%host %other %logname %time1 %methodurl %code %bytesd %refererquot %uaquot" AWSTATS_CONF_SITEDOMAIN=map5.nl +AWSTATS_CONF_LOGSEPARATOR=" " AWSTATS_CONF_DNSLOOKUP=1 AWSTATS_CONF_DEBUGMESSAGES=1 AWSTATS_CONF_HOSTALIASES=www.map5.nl -``` +``` ## Notes diff --git a/test/sites/demo.pygeoapi.io-master.env b/test/sites/demo.pygeoapi.io-master.env index ac86584..65d37a3 100644 --- a/test/sites/demo.pygeoapi.io-master.env +++ b/test/sites/demo.pygeoapi.io-master.env @@ -1,5 +1,6 @@ AWSTATS_CONF_LOGFILE=/var/local/log/demo.pygeoapi.io/traefik.log AWSTATS_CONF_LOGFORMAT="%host %other %logname %time1 %methodurl %code %bytesd %refererquot %uaquot %other %virtualnamequot %otherquot %other" +AWSTATS_CONF_LOGSEPARATOR=" " AWSTATS_CONF_SITEDOMAIN="Host-demo-pygeoapi-io-localhost-PathPrefix-master-22" AWSTATS_CONF_DNSLOOKUP=1 AWSTATS_CONF_DEBUGMESSAGES=1 diff --git a/test/sites/demo.pygeoapi.io.env b/test/sites/demo.pygeoapi.io.env index c057425..de56d47 100644 --- a/test/sites/demo.pygeoapi.io.env +++ b/test/sites/demo.pygeoapi.io.env @@ -1,5 +1,6 @@ AWSTATS_CONF_LOGFILE=/var/local/log/demo.pygeoapi.io/traefik.log AWSTATS_CONF_LOGFORMAT="%host %other %logname %time1 %methodurl %code %bytesd %refererquot %uaquot %other %virtualnamequot %otherquot %other" +AWSTATS_CONF_LOGSEPARATOR=" " AWSTATS_CONF_SITEDOMAIN="Host-demo-pygeoapi-io-PathPrefixStrip-1" AWSTATS_CONF_DNSLOOKUP=1 AWSTATS_CONF_DEBUGMESSAGES=1 diff --git a/test/sites/map5.nl.env b/test/sites/map5.nl.env index 9d45322..ff52026 100644 --- a/test/sites/map5.nl.env +++ b/test/sites/map5.nl.env @@ -1,5 +1,6 @@ AWSTATS_CONF_LOGFILE=/var/local/log/map5.nl/map5.nl-access.log AWSTATS_CONF_LOGFORMAT="%host %other %logname %time1 %methodurl %code %bytesd %refererquot %uaquot" +AWSTATS_CONF_LOGSEPARATOR=" " AWSTATS_CONF_SITEDOMAIN=map5.nl AWSTATS_CONF_DNSLOOKUP=1 AWSTATS_CONF_DEBUGMESSAGES=1