diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-install
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2010-02-11 20:49:41.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-install 2010-02-11 23:58:08.000000000 +1100
@@ -7,7 +7,10 @@
/sbin/e-smith/signal-event remoteaccess-update
/bin/echo "webaccess config"
-/bin/chown -R www:www /var/www/html/webaccess/tmp
+/bin/chown -R www:www /var/lib/zarafa-webaccess/tmp
+FILE=/var/lib/zarafa-webaccess-mobile/cache; if [ -d $FILE ]; then /bin/chown -R www:www $FILE; fi
+FILE=/var/lib/zarafa-webaccess-mobile/templates_c; 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
/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
/usr/bin/sv restart /service/httpd-e-smith
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-11 20:49:41.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-update 2010-02-11 23:58:00.000000000 +1100
@@ -1,10 +1,12 @@
#!/bin/sh
# update files controled by upstream sources
-/bin/mkdir -p /var/www/html/webaccess/tmp
-/bin/mkdir -p /var/www/html/z-push/state
-
-/bin/chown -R www:www /var/www/html/webaccess/tmp
-/bin/chmod 755 /var/www/html/z-push/state
-/bin/chown -R www:www /var/www/html/z-push/state
+/bin/chown -R www:www /var/lib/zarafa-webaccess/tmp
+FILE=/var/lib/zarafa-webaccess-mobile/cache; if [ -d $FILE ]; then /bin/chown -R www:www $FILE; fi
+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
+
diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2010-02-11 20:49:41.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2010-02-11 21:22:57.000000000 +1100
@@ -6,8 +6,8 @@
$OUT .= qq(
# Zarafa specific configuration files.
- Alias /zarafa /var/www/html/webaccess/
-
+ Alias /zarafa /usr/share/zarafa-webaccess/
+
Options -Indexes
AllowOverride None
order allow,deny
diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases 2010-02-11 20:49:41.000000000 +1100
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases 2010-02-11 21:22:23.000000000 +1100
@@ -6,11 +6,11 @@
my $zwebmailAccessType = $zarafa{'access'} || "SSL";
my $dirs;
- $dirs{zarafa} = '/var/www/html/webaccess';
- $dirs{webaccess} = '/var/www/html/webaccess';
- $dirs{webmail} = '/var/www/html/webaccess';
+ $dirs{zarafa} = '/usr/share/zarafa-webaccess';
+ $dirs{webaccess} = '/usr/share/zarafa-webaccess';
+ $dirs{webmail} = '/usr/share/zarafa-webaccess';
if ($imp{'status'} eq 'enabled') {$dirs{webmail} = ''};
- $dirs{mobile} = '/var/www/html/webaccess-mobile';
+ $dirs{mobile} = '/usr/share/zarafa-webaccess-mobile';
$dirs{'Microsoft-Server-ActiveSync'} = '/var/www/html/z-push/index.php';
return " # Zarafa is disabled in this VirtualHost\n"