One port-checking system

diff --git a/cgi-bin/check-port? b/cgi-bin/check-port?
index 16f0bf6c57db9eaa3802d6fc46f3952a613de320..ee15b600d3666238a1b88be9c95c055749eaf6e1 100755 (executable)
--- a/cgi-bin/check-port?
+++ b/cgi-bin/check-port?
@@ -1,7 +1,11 @@
-[ $# != 2 ] && echo "Wrong number of arguments to $(basename $0)" && exit 0
+[ $# != 2 ] && echo "Wrong number of arguments to $(basename $0)" && exit 1
 HOST="$1"
 PORT="$2"
 
-STATUS="$(nmap "$HOST" -p "$PORT" -oN - | grep "$PORT" | grep -v "#")"
-echo "$STATUS"
-echo "$STATUS" | grep -q "open"
+if nmap "$HOST" -p "$PORT" -oN - 2>/dev/null | grep -q open
+then
+  echo "Port $PORT open on $HOST"
+else
+  echo "Port $PORT not open on $HOST"
+  exit 1
+fi

diff --git a/cgi-bin/service.status.d/irc.za3k.com b/cgi-bin/service.status.d/irc.za3k.com
index 594096d50d893e7808f7b10f69dd85144274b3fe..c3aed97616cb011ea00b631abc87fd4f6969f6fd 100644 (file)
--- a/cgi-bin/service.status.d/irc.za3k.com
+++ b/cgi-bin/service.status.d/irc.za3k.com
@@ -1,7 +1 @@
-if  nmap irc.za3k.com -p 6667 2>/dev/null | grep -q open
-then
-  echo "Port 6667 open"
-else
-  echo "Port 6667 not open"
-  exit 1
-fi
+./check-port? irc.za3k.com 6667