From 3c631c8075a4b63d541af3c52680a6d378e5cd4f Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Mon, 27 Nov 2017 20:20:20 +0000
Subject: [PATCH] add some items for fedorapeople.org

---
 roles/awstats/files/combineHttpLogs.sh        | 22 +++++++++++++++----
 .../files/run-daily-awstats.sh                |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/roles/awstats/files/combineHttpLogs.sh b/roles/awstats/files/combineHttpLogs.sh
index b997de9456..36d9d94826 100644
--- a/roles/awstats/files/combineHttpLogs.sh
+++ b/roles/awstats/files/combineHttpLogs.sh
@@ -31,29 +31,43 @@ LOGDIR=/var/log/hosts
 NFSDIR=/mnt/fedora_stats/combined-http
 PROXYLOG=${LOGDIR}/proxy*/${YEAR}/${MONTH}/${DAY}/http/
 DL_LOG=${LOGDIR}/download*/${YEAR}/${MONTH}/${DAY}/http/
+PEOPLE=${LOGDIR}/people*/${YEAR}/${MONTH}/${DAY}/http/
 
 TARGET=${NFSDIR}/${YEAR}/${MONTH}/${DAY}
 
 LOGMERGE=/usr/share/awstats/tools/logresolvemerge.pl
 
-FILES=$( ls -1 ${PROXYLOG}/*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
-
 mkdir -p ${TARGET}
 
+##
+## Merge the Proxies
+FILES=$( ls -1 ${PROXYLOG}/*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
+
 for FILE in ${FILES}; do
     TEMP=$(echo ${FILE} | sed 's/\.xz$//')
     perl ${LOGMERGE} ${PROXYLOG}/${FILE} > ${TARGET}/${TEMP}
 done
 
+##
+## Merge the Downloads
 FILES=$( ls -1 ${DL_LOG}/dl*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
 
-mkdir -p ${TARGET}
-
 for FILE in ${FILES}; do
     TEMP=$(echo ${FILE} | sed 's/\.xz$//')
     perl ${LOGMERGE} ${DL_LOG}/${FILE} > ${TARGET}/${TEMP}
 done
 
+##
+## Merge the People
+##
+## Merge the Downloads
+FILES=$( ls -1 ${PEOPLE}/fedora*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
+
+for FILE in ${FILES}; do
+    TEMP=$(echo ${FILE} | sed 's/\.xz$//')
+    perl ${LOGMERGE} ${PEOPLE}/${FILE} > ${TARGET}/${TEMP}
+done
+
 # Now we link up the files into latest directory
 # 1. make sure the latest directory exists
 # 2. go into it.
diff --git a/roles/web-data-analysis/files/run-daily-awstats.sh b/roles/web-data-analysis/files/run-daily-awstats.sh
index 9dc3ccbe5a..8b559d2051 100644
--- a/roles/web-data-analysis/files/run-daily-awstats.sh
+++ b/roles/web-data-analysis/files/run-daily-awstats.sh
@@ -43,7 +43,7 @@ HTMLDOC=/usr/bin/htmldoc
 
 #SITES="apps.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org docs.fedoraproject.org download.fedoraproject.org fedoramagazine.org fedoraproject.org geoip.fedoraproject.org get.fedoraproject.org getfedora.org labs.fedoraproject.org mirrors.fedoraproject.org spins.fedoraproject.org start.fedoraproject.org"
 
-SITES="admin.fedoraproject.org apps.fedoraproject.org arm.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org boot.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org darkserver.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org dl.fedoraproject.org docs.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org geoip.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org taskotron.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org"
+SITES="admin.fedoraproject.org apps.fedoraproject.org arm.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org boot.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org darkserver.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org dl.fedoraproject.org docs.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org geoip.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org taskotron.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org "
 
 pushd ${CONFDIR}
 for SITE in ${SITES}; do