diff --git a/powerwall.sh b/powerwall.sh index 82959ea3..32a214d9 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -351,6 +351,15 @@ CHECKPOWER_SERVICE(){ else sleep 20s fi + + if [ $(date +%d) -eq 1 ] && [ $(date +%H)$(date +%M) -eq 0000 ] && [ "${archivedone}" != "complete" ]; then + LOGROTATE & + archivedone=complete + + elif [ $(date +%d) -eq 1 ] && [ $(date +%H)$(date +%M) -eq 0100 ] && [ "${archivedone}" == "complete" ]; then + archivedone=false + fi + sleep 10s done # & } @@ -658,7 +667,7 @@ ISCSIVMSHUTDOWN(){ } LOGROTATE(){ - STOPALL_SERVICES + # STOPALL_SERVICES lm=`expr $(date +'%m') - 1` if [ $lm = 0 ]; then lm=12 @@ -669,8 +678,8 @@ LOGROTATE(){ ARCHIVEFOLDER=${LOGARCHIVE}/${ly}-${lm} mkdir -p ${ARCHIVEFOLDER} mv ${LOGFOLDER}/log* ${ARCHIVEFOLDER}/ - source ${FOLDER}/defaults.inc - STARTALL_SERVICES + # source ${FOLDER}/defaults.inc + # STARTALL_SERVICES } TEST(){ @@ -724,7 +733,6 @@ fi checktemp) CHECKTEMP ${2};; checkpower) CHECKPOWER;; test) CHECKTEMP ${2} ${3};; - logrotate) LOGROTATE;; iscsi-vm-shutdown) ISCSIVMSHUTDOWN;; shutdownhost) SHUTDOWN_SERVER ${2};; @@ -801,7 +809,6 @@ fi echo -e " ${idsCL[LightYellow]} cmd = { start / stop / restart / status }" echo echo -e " ${idsCL[Yellow]}update ${idsCL[Default]}--> Check for and install new PowerWall Script updates" - echo -e " ${idsCL[Yellow]}logrotate ${idsCL[Default]}--> Archive's all logs, set for a monthly cronjob" echo ;; esac