diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database
--- smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database	2008-10-03 16:17:36.000000000 -0500
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database	2008-10-08 16:40:39.000000000 -0500
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-PW=$(/sbin/e-smith/config getprop zarafa-server DbPassword)
-
-mysqladmin drop zarafa
-
-mysqladmin create zarafa
-mysql -e "grant all privileges on zarafa.* to zarafa@localhost identified by '$PW'"
-mysql -e "flush privileges"
-
-mysqlshow
+/sbin/e-smith/expand-template /etc/e-smith/sql/init/80zarafa
+/etc/rc.d/init.d/mysql.init start
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa
--- smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa	2008-10-02 12:07:12.000000000 -0500
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa	2008-10-08 17:41:46.000000000 -0500
@@ -1,7 +1,7 @@
 {
-    my $db = $zarafa{DbName} || 'zarafa';
-    my $user = $zarafa{DbUser} || 'zarafa';
-    my $pass = $zarafa{DbPassword} || 'changeme';
+    my $db = ${'zarafa-server'}{DbName} || 'zarafa';
+    my $user = ${'zarafa-server'}{DbUser} || 'zarafa';
+    my $pass = ${'zarafa-server'}{DbPassword} || 'changeme';
     $OUT .= <<END
 #! /bin/sh
     if [ -d /var/lib/mysql/$db ]; then
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg
--- smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg	2008-10-03 14:38:43.000000000 -0500
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg	2008-10-08 16:40:39.000000000 -0500
@@ -77,13 +77,13 @@
 mysql_port		= 3306
 
 # The user under which we connect with MySQL
-mysql_user		= zarafa
+mysql_user		= { ${'zarafa-server'}{DbUser} || 'zarafa'; }
 
 # The password for the user (leave empty for no password)
 mysql_password		= { ${'zarafa-server'}{DbPassword}; }
 
 # Database to connect to
-mysql_database		= zarafa
+mysql_database		= { ${'zarafa-server'}{DbName} || 'zarafa'; }
 
 # Where to place attachments. Value can be 'database' or 'files'
 attachment_storage	= files
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa
--- smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa	2008-10-08 17:46:00.000000000 -0500
@@ -0,0 +1 @@
+PERMS=0750