diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-services
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services	2010-02-13 16:58:45.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-services	2010-02-13 22:52:25.000000000 +1100
@@ -1,9 +1,63 @@
 #!/bin/sh
 
-/etc/rc.d/init.d/zarafa-gateway $1
-/etc/rc.d/init.d/zarafa-ical $1
-/etc/rc.d/init.d/zarafa-licensed $1
-/etc/rc.d/init.d/zarafa-monitor $1
-/etc/rc.d/init.d/zarafa-server $1
-/etc/rc.d/init.d/zarafa-spooler $1
+FILE=/etc/rc.d/init.d/zarafa-licensed
+
+if [ "$1" == start ]; then
+ /etc/rc.d/init.d/zarafa-gateway start
+ /etc/rc.d/init.d/zarafa-ical start
+ if [ -a $FILE ]; then $FILE start; fi
+ /etc/rc.d/init.d/zarafa-monitor start
+ /etc/rc.d/init.d/zarafa-server start
+ /etc/rc.d/init.d/zarafa-spooler start
+ exit 0
+fi
+
+if [ "$1" == stop ]; then
+ /etc/rc.d/init.d/zarafa-gateway stop
+ /etc/rc.d/init.d/zarafa-ical stop
+ if [ -a $FILE ]; then $FILE stop; fi
+ /etc/rc.d/init.d/zarafa-monitor stop
+ /etc/rc.d/init.d/zarafa-spooler stop
+ /etc/rc.d/init.d/zarafa-server stop
+ exit 0
+fi
+
+if [ "$1" == restart ]; then
+ /etc/rc.d/init.d/zarafa-gateway stop
+ /etc/rc.d/init.d/zarafa-ical stop
+ if [ -a $FILE ]; then $FILE stop; fi
+ /etc/rc.d/init.d/zarafa-monitor stop
+ /etc/rc.d/init.d/zarafa-spooler stop
+ /etc/rc.d/init.d/zarafa-server stop
+ /etc/rc.d/init.d/zarafa-gateway start
+ /etc/rc.d/init.d/zarafa-ical start
+ if [ -a $FILE ]; then $FILE start; fi
+ /etc/rc.d/init.d/zarafa-monitor start
+ /etc/rc.d/init.d/zarafa-server start
+ /etc/rc.d/init.d/zarafa-spooler start
+ exit 0
+fi
+
+if [ "$1" == enabled ]; then
+ config setprop zarafa-gateway status enabled
+ config setprop zarafa-ical status enabled
+ if [ -a $FILE ]; then config setprop zarafa-licensed status enabled; fi
+ config setprop zarafa-monitor status enabled
+ config setprop zarafa-server status enabled
+ config setprop zarafa-spooler status enabled
+ exit 0
+fi
+
+if [ "$1" == disabled ]; then
+ config setprop zarafa-gateway status disabled
+ config setprop zarafa-ical status disabled
+ if [ -a $FILE ]; then config setprop zarafa-licensed status disabled; fi
+ config setprop zarafa-monitor status disabled
+ config setprop zarafa-server status disabled
+ config setprop zarafa-spooler status disabled
+ exit 0
+fi
+
+echo "Usage: start|stop|restart|enabled|disabled"
+exit 0
 
diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services-stop smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-services-stop
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-services-stop	2010-02-13 16:58:45.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-services-stop	1970-01-01 10:00:00.000000000 +1000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-/etc/rc.d/init.d/zarafa-gateway stop
-/etc/rc.d/init.d/zarafa-ical stop
-/etc/rc.d/init.d/zarafa-licensed stop
-/etc/rc.d/init.d/zarafa-monitor stop
-/etc/rc.d/init.d/zarafa-spooler stop
-/etc/rc.d/init.d/zarafa-server stop
diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-update smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-update
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-update	2010-02-13 16:58:46.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-update	2010-02-13 22:54:00.000000000 +1100
@@ -6,7 +6,5 @@
 FILE=/var/lib/zarafa-webaccess-mobile/templates_c; if [ -d $FILE ]; then /bin/chown -R www:www $FILE; fi
 FILE=/var/lib/zarafa/z-push/state; if [ -d $FILE ]; then /bin/chown -R www:www $FILE; fi
 FILE=/etc/httpd/conf.d/zarafa-webaccess.conf; if [ -a $FILE ]; then /bin/rm -f $FILE; fi
-#/bin/chown -R www:www /var/lib/zarafa/z-push/state
-/bin/rm -f /etc/httpd/conf.d/zarafa-webaccess.conf