Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-nagios

diff --git a/dsa-nagios-checks/checks/dsa-check-config b/dsa-nagios-checks/checks/dsa-check-config
index 2772994..7ce992e 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-config
+++ b/dsa-nagios-checks/checks/dsa-check-config
@@ -9,7 +9,7 @@ set -e
 err=0
 
 log() {
-       if [ "$0" = "ok" ] && [ "$err" = 0 ]; then
+       if [ "$1" = "ok" ] && [ "$err" = 0 ]; then
                err=0
        elif [ "$1" = "warn" ] && [ "$err" -lt 1 ]; then
                err=1

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 1931f57..8426b4c 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -6,7 +6,8 @@ dsa-nagios-checks (119) UNRELEASED; urgency=medium
 
   [ Adam D. Barratt ]
   * dsa-check-soas: fix variable scoping
-  * Add check_clamav_signatures.
+  * Add dsa-check-clamav-signatures.
+  * dsa-check-config: fix typo in log check for "OK" statuses.
 
   [ Julien Cristau ]
   * port dsa-check-statusfile and dsa-check-memory to python3