Index: /home/mueller/bug/svn/18828/univention-nagios/debian/changelog
===================================================================
--- /home/mueller/bug/svn/18828/univention-nagios/debian/changelog	(Revision 1839)
+++ /home/mueller/bug/svn/18828/univention-nagios/debian/changelog	(Arbeitskopie)
@@ -1,3 +1,9 @@
+univention-nagios (4.0.13-3) unstable; urgency=low
+
+  * modify JOIN-Skript normal_check_interval to 150 and retry_check_interval to 30 for UNIVENTION_JOINSTATUS (Bug #18828)
+
+ -- Martin Müller <packages@univention.de>  Wed, 29 Jun 2011 14:42:48 +0200
+
 univention-nagios (4.0.13-2) unstable; urgency=low
 
   * switch from check_univention_winbind to
Index: /home/mueller/bug/svn/18828/univention-nagios/26univention-nagios-server.inst
===================================================================
--- /home/mueller/bug/svn/18828/univention-nagios/26univention-nagios-server.inst	(Revision 1839)
+++ /home/mueller/bug/svn/18828/univention-nagios/26univention-nagios-server.inst	(Arbeitskopie)
@@ -30,7 +30,7 @@
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
 
-VERSION=3
+VERSION=4
 . /usr/share/univention-join/joinscripthelper.lib
 joinscript_init
 
@@ -101,8 +101,13 @@
 
 univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_NMBD" --set description="Default Service: check if nmbd is functional" --set checkCommand="check_univention_nmbd" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="15" --set retryCheckInterval="2" --set maxCheckAttempts="2" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
 
-univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_JOINSTATUS" --set description="Default Service: check if system has been joined successfully" --set checkCommand="check_univention_joinstatus" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="1440" --set retryCheckInterval="480" --set maxCheckAttempts="1" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
+#update values of normalCheckInterval and retryCheckInterval (Bug #18828)
+if [ "$(udm nagios/service list --filter name=UNIVENTION_JOINSTATUS | egrep -c '^[ \t]+retryCheckInterval:[ \t]+480$|^[ \t]+normalCheckInterval:[ \t]+1440$')" = '2' ] ; then
+	udm nagios/service modify --dn "cn=UNIVENTION_JOINSTATUS,cn=nagios,$ldap_base" --set normalCheckInterval="180" --set retryCheckInterval="30"
+fi
 
+univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_JOINSTATUS" --set description="Default Service: check if system has been joined successfully" --set checkCommand="check_univention_joinstatus" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="180" --set retryCheckInterval="30" --set maxCheckAttempts="1" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
+
 /etc/init.d/nagios2 restart 2> /dev/null > /dev/null || true
 
 univention-directory-manager container/cn create $@ --ignore_exists --position cn=univention,$ldap_base --set name=console