From 48465378bcbb7de94b35f4a0383ebd6a1ecc91bf Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 7 Jun 2016 23:41:16 +0000
Subject: [PATCH] take out the sort -m as that doesnt work

---
 roles/web-data-analysis/files/condense-getfedoralogs.sh | 4 ++--
 roles/web-data-analysis/files/condense-mirrorlogs.sh    | 4 ++--
 roles/web-data-analysis/files/run-daily-awstats.sh      | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/web-data-analysis/files/condense-getfedoralogs.sh b/roles/web-data-analysis/files/condense-getfedoralogs.sh
index 70eb9f1008..bdf31b083e 100644
--- a/roles/web-data-analysis/files/condense-getfedoralogs.sh
+++ b/roles/web-data-analysis/files/condense-getfedoralogs.sh
@@ -77,8 +77,8 @@ fi
 # stuck and you end up with days or weeks of data in a single
 # file. Doing a continual sort clears up that.
 
-sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 4G -u -m ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ${WORKFILE}
-sort -o ${WORKDIR}/out-${YEAR} -S 4G -u -m ${WORKDIR}/out-${YEAR} ${WORKFILE}
+sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 8G -u ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ${WORKFILE}
+sort -o ${WORKDIR}/out-${YEAR} -S 8G -u ${WORKDIR}/out-${YEAR} ${WORKFILE}
 
 # Because the logs stop at 04:00 we can only get 24 hours from 6 days before. 
 egrep "${OLDDATE}" ${WORKDIR}/out-${OLDYEAR} > ${TEMPDIR}/watched-day
diff --git a/roles/web-data-analysis/files/condense-mirrorlogs.sh b/roles/web-data-analysis/files/condense-mirrorlogs.sh
index 3fef9164a8..2760d19f81 100644
--- a/roles/web-data-analysis/files/condense-mirrorlogs.sh
+++ b/roles/web-data-analysis/files/condense-mirrorlogs.sh
@@ -78,8 +78,8 @@ fi
 # file. Doing a continual sort clears up that.
 
 sort -o ${WORKFILE} -u ${WORKFILE}
-sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 8G -T /srv/tmp -u -m ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ${WORKFILE}
-sort -o ${WORKDIR}/out-${YEAR} -S 8G -T /srv/tmp -u -m ${WORKDIR}/out-${YEAR} ${WORKFILE}
+sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 8G -T /srv/tmp -u ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ${WORKFILE}
+sort -o ${WORKDIR}/out-${YEAR} -S 8G -T /srv/tmp -u ${WORKDIR}/out-${YEAR} ${WORKFILE}
 
 # Because the logs stop at 04:00 we can only get 24 hours from 6 days before. 
 egrep "${OLDDATE}" ${WORKDIR}/out-${OLDYEAR} > ${TEMPDIR}/watched-day
diff --git a/roles/web-data-analysis/files/run-daily-awstats.sh b/roles/web-data-analysis/files/run-daily-awstats.sh
index 01471e6704..667a89c2aa 100644
--- a/roles/web-data-analysis/files/run-daily-awstats.sh
+++ b/roles/web-data-analysis/files/run-daily-awstats.sh
@@ -43,8 +43,9 @@ 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"
 
-
+pushd ${CONFDIR}
 for SITE in ${SITES}; do
     perl /usr/share/awstats/wwwroot/cgi-bin/awstats.pl -config=${CONFDIR}/${SITE} -update -Logfile=${TREEDIR}/${SITE}-access.log
+    perl /mnt/fedora_stats/awstats/conf/awstats_buildstaticpages.pl -awstatsprog=${AWSTATS} -config=${SITE} -month=all -year=${YEAR} -dir=${OUTDIR}/${YEAR} ;
 done
-
+popd