Merge branch 'master' of github.com:henrik-andreasson/syscheck

henrik-andreasson · Dec 7, 2018 · 6c9aad9 · 6c9aad9
2 parents a7ba27a + 1a51d7f
commit 6c9aad9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/related-available/904_make_mysql_db_backup.sh b/related-available/904_make_mysql_db_backup.sh
@@ -89,7 +89,7 @@ for (( i = 0 ;  i < ${#DBNAME[@]} ; i++ )) ; do
     DATESTR=$(date +${DATESTING})
     MYSQLBACKUPFULLFILENAME="${MYSQLBACKUPDIR}/${EXTRADIR}/${DBNAME[$i]}-${DATESTR}.gz"
     DATESTART=$(date +"%s")
-    dumpret=$($MYSQLDUMP_BIN -u root --password="${MYSQLROOT_PASSWORD}" ${MYSQLDUMP_OPTIONS} "${DB_NAME}" "${MYSQLDUMP_TABLES}" |& gzip > ${MYSQLBACKUPFULLFILENAME} 2>&1)
+    dumpret=$($MYSQLDUMP_BIN -u root --password="${MYSQLROOT_PASSWORD}" ${MYSQLDUMP_OPTIONS} "${DB_NAME}" ${MYSQLDUMP_TABLES} |& gzip > ${MYSQLBACKUPFULLFILENAME} 2>&1)
     retcode=$?
     DATEDONE=$(date +"%s")
     let TIMETOCOMPLEATE="$DATEDONE - $DATESTART" || true # not to stop script

diff --git a/scripts-available/sc_17_ntp.sh b/scripts-available/sc_17_ntp.sh
@@ -50,34 +50,38 @@ fi
 
 checkntp () {
 	NTPSERVER=$1
+	SCRIPTINDEX=$2 
 	if [ "x${NTPSERVER}" = "x" ] ; then
 		printlogmess ${SCRIPTNAME} ${SCRIPTID} ${SCRIPTINDEX}   $ERROR $ERRNO_5 "$DESCR_5" "ntpserver not set"
 		return
 	fi
 
-	SCRIPTINDEX=$2 
-
-        SCRIPTINDEX=$(addOneToIndex $SCRIPTINDEX)
+
 	XNTPDPID=`ps -ef | grep ntpd | grep -v grep | awk '{print $2}'`
 	if [ x"$XNTPDPID" = "x" ]; then
 		printlogmess ${SCRIPTNAME} ${SCRIPTID} ${SCRIPTINDEX}   $ERROR $ERRNO_2 "$DESCR_2"
 		exit
 	fi	
 
 	# Get information about ntp
-        SCRIPTINDEX=$(addOneToIndex $SCRIPTINDEX)
-        result=$(echo "peers" | ${NTPBIN} -n 2>&1| grep ${NTPSERVER} | egrep "^(\*|\+)" )
-        if [ "x${result}" = "x" ] ; then
-		printlogmess ${SCRIPTNAME} ${SCRIPTID} ${SCRIPTINDEX}   $ERROR $ERRNO_3 "$DESCR_3" "$NTPSERVER ($result)" 
-	else
-		printlogmess ${SCRIPTNAME} ${SCRIPTID} ${SCRIPTINDEX}   $INFO $ERRNO_1 "$DESCR_1" "$NTPSERVER"
-	fi
+    result=$(echo "peers" | ${NTPBIN} -n 2>&1| grep ${NTPSERVER} | egrep "^(\*)" )
+    STATUS=${STATUS:-$result}
 
 }
 
 # check with the IP:s of all ntp servers
 
+STATUS=""
+
 for (( i = 0 ;  i < ${#NTPSERVER[@]} ; i++ )) ; do
-	checkntp ${NTPSERVER[$i]} $SCRIPTINDEX
+    checkntp ${NTPSERVER[$i]} $SCRIPTINDEX
 done
 
+SCRIPTINDEX=$(addOneToIndex $SCRIPTINDEX)
+
+if [ "x${result}" = "x" ] ; then
+        printlogmess ${SCRIPTNAME} ${SCRIPTID} ${SCRIPTINDEX}   $ERROR $ERRNO_3 "$DESCR_3" "$NTPSERVER ($result)" 
+else
+        printlogmess ${SCRIPTNAME} ${SCRIPTID} ${SCRIPTINDEX}   $INFO $ERRNO_1 "$DESCR_1" "$NTPSERVER"
+fi
+