X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=monit-cn.git;a=blobdiff_plain;f=update-monit.d;h=7de29c1afe5efd3aa2e2b7b922facc6905bcab13;hp=8505053cf6f1b1405aeb7e7bbca057c6b3dfafc4;hb=HEAD;hpb=a692bb5f579998ecb28bbb8713fe6bc28d50aa10

diff --git a/update-monit.d b/update-monit.d
index 8505053..d7abcbf 100755
--- a/update-monit.d
+++ b/update-monit.d
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2007  Dinko Korunic, CARNet, Grupa za izradu paketa
+# Copyright (C) 2007  Dinko Korunic, CARNET, Grupa za izradu paketa
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation; either version 2 of the License, or (at your
 # option) any later version.
 
-MONIT_DIR=/etc/monit.d
+MONIT_DIR=/etc/monit/conf.d
 TEMPLATES_DIR=/usr/share/monit-cn
 
 
@@ -110,7 +110,7 @@ check_template() {
         return 0
     fi
 
-    if cmp -s "$filename" "${TEMPLATES_DIR}/${serviceconf}"; then
+    if ! cmp -s "$filename" "${TEMPLATES_DIR}/${serviceconf}"; then
         RET=1
         return 1
     fi
@@ -172,7 +172,8 @@ done
 
 if [ $changed -eq 1 ]; then
     echo "CN: Stopping/restarting monit service"
-    pkill -9 -f /usr/sbin/monit || true
+    #pkill -9 -f /usr/bin/monit || true
+    service monit restart
 else
     echo "CN: No new services detected, sorry"
 fi