From 4f5cb34f00d3e8296ea79c318517b08bd5ed5144 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 20 Apr 2010 05:21:48 +0000
Subject: [PATCH] include "awstats.model.conf" before customize settings in it,
 refs #165

---
 templates/misc/awstatsmodel/awstats.froxlor.model.conf      | 6 +++---
 .../misc/awstatsmodel/awstats.froxlor.model_log_sql.conf    | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/misc/awstatsmodel/awstats.froxlor.model.conf b/templates/misc/awstatsmodel/awstats.froxlor.model.conf
index 0ba97c2c..f587ab6e 100644
--- a/templates/misc/awstatsmodel/awstats.froxlor.model.conf
+++ b/templates/misc/awstatsmodel/awstats.froxlor.model.conf
@@ -1,3 +1,6 @@
+# Include local configuration options identical for all virtual hosts
+Include "{AWSTATS_CONF}awstats.model.conf"
+
 LogFile="{LOG_FILE}"
 LogType=W
 LogFormat = 1
@@ -5,6 +8,3 @@ LogSeparator=" "
 SiteDomain="{SITE_DOMAIN}"
 HostAliases="{HOST_ALIASES}"
 DirData="{CUSTOMER_DOCROOT}"
-
-# Include local configuration options identical for all virtual hosts
-Include "{AWSTATS_CONF}awstats.model.conf"
diff --git a/templates/misc/awstatsmodel/awstats.froxlor.model_log_sql.conf b/templates/misc/awstatsmodel/awstats.froxlor.model_log_sql.conf
index d40de2c9..45435748 100644
--- a/templates/misc/awstatsmodel/awstats.froxlor.model_log_sql.conf
+++ b/templates/misc/awstatsmodel/awstats.froxlor.model_log_sql.conf
@@ -1,3 +1,6 @@
+# Include local configuration options identical for all virtual hosts
+Include "{AWSTATS_CONF}awstats.model.conf"
+
 LogFile="{LOG_FILE}"
 LogType=W
 LogFormat = "%host %virtualname %logname %time1 %methodurl %code %bytesd %refererquot %uaquot"
@@ -6,5 +9,3 @@ SiteDomain="{SITE_DOMAIN}"
 HostAliases="{HOST_ALIASES}"
 DirData="{CUSTOMER_DOCROOT}"
 
-# Include local configuration options identical for all virtual hosts
-Include "{AWSTATS_CONF}awstats.model.conf"