[D-community-commits] r246 - trunk/fai-config-dir/scripts/JABBERD

[holger at alioth.debian.org]

Author: holger
Date: 2008-03-10 13:31:38 +0000 (Mon, 10 Mar 2008)
New Revision: 246

Removed:
   trunk/fai-config-dir/scripts/JABBERD/99-FOO
Modified:
   trunk/fai-config-dir/scripts/JABBERD/10-ejabberd
Log:
merge 99-FOO into 10-ejabberd

Modified: trunk/fai-config-dir/scripts/JABBERD/10-ejabberd
===================================================================
--- trunk/fai-config-dir/scripts/JABBERD/10-ejabberd	2008-03-10 13:26:10 UTC (rev 245)
+++ trunk/fai-config-dir/scripts/JABBERD/10-ejabberd	2008-03-10 13:31:38 UTC (rev 246)
@@ -7,7 +7,13 @@
 
 # stop ejabberd
 $ROOTCMD /etc/init.d/ejabberd stop
+$ROOTCMD killall beam
+$ROOTCMD killall epmd
 
+# cleanup
+$ROOTCMD rm -f /var/lib/ejabberd/*
+$ROOTCMD rm -f /etc/ejabberd/ejabberd.c*
+
 # add server cert to ejabberd directory
 $ROOTCMD rm /etc/ejabberd/debian_community.pem
 $ROOTCMD cp /etc/ssl/certs/debian_community.pem /etc/ejabberd/debian_community.pem
@@ -19,7 +25,8 @@
 $ROOTCMD chown ejabberd:ejabberd /etc/ejabberd/ejabberd.cfg
 
 # create admin-user 'vt100'
-$ROOTCMD ejabberdctl register vt100 debian-community.org sillypasswd
+$ROOTCMD ejabberdctl register vt100 "debian-community.org" sillypasswd
 
 # start ejabberd
 $ROOTCMD /etc/init.d/ejabberd start
+

Deleted: trunk/fai-config-dir/scripts/JABBERD/99-FOO
===================================================================
--- trunk/fai-config-dir/scripts/JABBERD/99-FOO	2008-03-10 13:26:10 UTC (rev 245)
+++ trunk/fai-config-dir/scripts/JABBERD/99-FOO	2008-03-10 13:31:38 UTC (rev 246)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-#
-#        (c) 2008 Peter Schwindt	peter at schwindt-net.de
-#        GPL2 licenced
-#
-
-# stop ejabberd
-$ROOTCMD /etc/init.d/ejabberd stop
-
-$ROOTCMD killall beam
-$ROOTCMD killall epmd
-
-$ROOTCMD rm /var/lib/ejabberd/*
-
-$ROOTCMD rm /etc/ejabberd/ejabberd.c*
-
-fcopy -r -M /etc/ejabberd/
-$ROOTCMD chmod 600 /etc/ejabberd/ejabberd.cfg
-$ROOTCMD chown ejabberd:ejabberd /etc/ejabberd/ejabberd.cfg
-
-$ROOTCMD /etc/init.d/ejabberd start
-
-$ROOTCMD ejabberdctl register vt100 "debian-community.org" sillypasswd
-