[D-community-commits] r254 - in trunk/fai-config-dir/scripts: JABBERD LDAPSERVER

[holger at alioth.debian.org]

Author: holger
Date: 2008-03-10 14:16:21 +0000 (Mon, 10 Mar 2008)
New Revision: 254

Modified:
   trunk/fai-config-dir/scripts/JABBERD/10-ejabberd
   trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd
Log:
do what i say

Modified: trunk/fai-config-dir/scripts/JABBERD/10-ejabberd
===================================================================
--- trunk/fai-config-dir/scripts/JABBERD/10-ejabberd	2008-03-10 14:11:14 UTC (rev 253)
+++ trunk/fai-config-dir/scripts/JABBERD/10-ejabberd	2008-03-10 14:16:21 UTC (rev 254)
@@ -6,10 +6,14 @@
 #
 
 # stop ejabberd
-$ROOTCMD /etc/init.d/ejabberd stop
-$ROOTCMD killall beam
-$ROOTCMD killall epmd
+$ROOTCMD /etc/init.d/ejabberd stop 2>/dev/null
+$ROOTCMD killall -9 beam 2>/dev/null
+$ROOTCMD killall -9 epmd 2>/dev/null
 
+#
+# needs tests, so that this is only run once
+#
+
 # cleanup
 $ROOTCMD rm -f /var/lib/ejabberd/*
 $ROOTCMD rm -f /etc/ejabberd/ejabberd.c*

Modified: trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd
===================================================================
--- trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd	2008-03-10 14:11:14 UTC (rev 253)
+++ trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd	2008-03-10 14:16:21 UTC (rev 254)
@@ -13,7 +13,7 @@
 #tmp
 # Ugly hack to remove the default database
 #if ! $ROOTCMD ldapsearch -h localhost -x -b "ou=People,dc=debian-community,dc=org" &>/dev/null; then
-    $ROOTCMD /etc/init.d/slapd stop
+    $ROOTCMD /etc/init.d/slapd stop 
     sleep 2
     $ROOTCMD rm -rf /var/lib/ldap/*
     echo -n "Creating initial LDAP directory..."