Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

add some items for fedorapeople.org

Browse source
This commit is contained in:
Stephen Smoogen 2017-11-27 20:20:20 +00:00
parent cd32d50d8c
commit 3c631c8075
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
roles/awstats/files/combineHttpLogs.sh
View file

@ -31,29 +31,43 @@ LOGDIR=/var/log/hosts
NFSDIR=/mnt/fedora_stats/combined-http NFSDIR=/mnt/fedora_stats/combined-http
PROXYLOG=${LOGDIR}/proxy*/${YEAR}/${MONTH}/${DAY}/http/ PROXYLOG=${LOGDIR}/proxy*/${YEAR}/${MONTH}/${DAY}/http/
DL_LOG=${LOGDIR}/download*/${YEAR}/${MONTH}/${DAY}/http/ DL_LOG=${LOGDIR}/download*/${YEAR}/${MONTH}/${DAY}/http/
PEOPLE=${LOGDIR}/people*/${YEAR}/${MONTH}/${DAY}/http/
TARGET=${NFSDIR}/${YEAR}/${MONTH}/${DAY} TARGET=${NFSDIR}/${YEAR}/${MONTH}/${DAY}
LOGMERGE=/usr/share/awstats/tools/logresolvemerge.pl 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} 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 for FILE in ${FILES}; do
TEMP=$(echo ${FILE} | sed 's/\.xz$//') TEMP=$(echo ${FILE} | sed 's/\.xz$//')
perl ${LOGMERGE} ${PROXYLOG}/${FILE} > ${TARGET}/${TEMP} perl ${LOGMERGE} ${PROXYLOG}/${FILE} > ${TARGET}/${TEMP}
done done
##
## Merge the Downloads
FILES=$( ls -1 ${DL_LOG}/dl*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u ) 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 for FILE in ${FILES}; do
TEMP=$(echo ${FILE} | sed 's/\.xz$//') TEMP=$(echo ${FILE} | sed 's/\.xz$//')
perl ${LOGMERGE} ${DL_LOG}/${FILE} > ${TARGET}/${TEMP} perl ${LOGMERGE} ${DL_LOG}/${FILE} > ${TARGET}/${TEMP}
done 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 # Now we link up the files into latest directory
# 1. make sure the latest directory exists # 1. make sure the latest directory exists
# 2. go into it. # 2. go into it.