diff --git a/archive_logs.sh b/archive_logs.sh index e9bf4a0..5831ecd 100755 --- a/archive_logs.sh +++ b/archive_logs.sh @@ -16,9 +16,10 @@ LogDir=${1} LogArchiveDir=/works/archive/logs DateCriteria="2 days ago" ExtraWildCard= +AddHostname= # ---------------- cmdline -while getopts "A:L:D:W:" opt; do +while getopts "A:L:D:W:H" opt; do case ${opt} in A ) LogArchiveDir=$OPTARG @@ -32,6 +33,9 @@ while getopts "A:L:D:W:" opt; do W ) ExtraWildCard=$OPTARG ;; + H ) + AddHostname=Y + ;; \? ) echo "Invalid option: -$OPTARG" >&2 usage @@ -74,7 +78,11 @@ if [ "$files" == "" ] then echo "No files found older than ${Oldest} in ${LogDir}" else - echo Archiving files: + TarFile="${LogArchiveDir}/${tmsig}.logs.tgz" + if [ "${AddHostname}" == "Y" ] ; then + TarFile="${LogArchiveDir}/${tmsig}.$(hostname -s).logs.tgz" + fi + echo Archiving to ${TarFile} files: echo ----------------- echo ${files} @@ -86,7 +94,7 @@ else tmsig="$(date -d "${tstmp1}" +"%Y%m%d_%H%M%S")-$(date -d "${tstmp2}" +"%Y%m%d_%H%M%S")" echo $tmsig - Cmd="tar zcvf ${LogArchiveDir}/${tmsig}.logs.tgz ${files}" + Cmd="tar zcvf ${TarFile} ${files}" echo $Cmd eval $Cmd