--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install.smessl2	2008-12-20 02:04:52.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install	2008-12-20 02:49:37.000000000 +1100
@@ -3,11 +3,26 @@
 /bin/echo "initialize-default-databases"
 /etc/e-smith/events/actions/initialize-default-databases
 
-/bin/echo "remoteaccess-update"
+/bin/echo "reassign and disable sme gateway ports"
+/sbin/e-smith/config setprop pop3 TCPPort 8110 
+/sbin/e-smith/config setprop pop3s TCPPort 8995 
+/sbin/e-smith/config setprop imap TCPPort 8143 
+/sbin/e-smith/config setprop imaps TCPPort 8993 
+/sbin/e-smith/config setprop pop3 status disabled 
+/sbin/e-smith/config setprop pop3s status disabled
+/sbin/e-smith/config setprop imap status disabled 
+/sbin/e-smith/config setprop imaps status disabled
+
+/bin/echo "signal-events"
+#/sbin/e-smith/signal-event email-update
 /sbin/e-smith/signal-event remoteaccess-update
 
-/bin/echo "creating zarafa database"
-/etc/e-smith/events/actions/zarafa-create-database
+# why doesn't email-update restart these on new ports ? 
+# need bigger event ? for now shut down
+/usr/bin/sv d /service/pop3
+/usr/bin/sv d /service/pop3s
+/usr/bin/sv d /service/imap 
+/usr/bin/sv d /service/imaps
 
 /bin/echo "webaccess config"
 /bin/chown -R www:www /var/www/html/webaccess/tmp
@@ -17,6 +32,9 @@
 /bin/echo "expanding zarafa templates"
 /etc/e-smith/events/actions/zarafa-expand-templates
 
+/bin/echo "creating zarafa database"
+/etc/e-smith/events/actions/zarafa-create-database
+
 /bin/echo "starting services"
 /etc/e-smith/events/actions/zarafa-services start
 
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg.smessl2	2008-12-20 01:57:35.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg	2008-12-20 01:58:09.000000000 +1100
@@ -43,10 +43,10 @@
 imap_capability_idle = yes
 
 # File with RSA key for SSL
-ssl_private_key_file	=	/home/e-smith/ssl.key/{SystemName}.{DomainName}.key
+ssl_private_key_file	=	/home/e-smith/ssl.key/{$SystemName}.{$DomainName}.key
 
 #File with certificate for SSL
-ssl_certificate_file	=	/home/e-smith/ssl.crt/{SystemName}.{DomainName}.crt
+ssl_certificate_file	=	/home/e-smith/ssl.crt/{$SystemName}.{$DomainName}.crt
 
 # Verify client certificate
 ssl_verify_client	=	no
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg.smessl2	2008-12-20 02:54:16.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg	2008-12-20 03:09:22.000000000 +1100
@@ -20,17 +20,16 @@
 ical_enable	=  { if (${'zarafa-ical'}{status} eq 'enabled') {'yes'} else {'no'}; }
 
 # port which the ical server listens on for normal connections
-ical_port = 8080
-ical_port	 =	 { ${'zarafa-ical'}{icalport} || '8008'; }
+ical_port	 =	 { ${'zarafa-ical'}{icalport} || '8088'; }
 
 # wether ssl connections can be made to the ical server
 icals_enable =  { if (${'zarafa-ical'}{status} eq 'enabled') {'yes'} else {'no'}; }
 
 # port which the ical server listens on for ssl connections
-icals_port	 =	 { ${'zarafa-ical'}{icalsport} || '8443'; }
+icals_port	 =	 { ${'zarafa-ical'}{icalsport} || '8089'; }
 
 # default connection to the Zarafa server
-server_socket	=	http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa
+server_socket	=	http://localhost:{${'zarafa-server'}{tcpport}||'237';}/zarafa
 
 ##############################################################
 # ICAL LOG SETTINGS
@@ -51,10 +50,10 @@
 # ICAL SSL SETTINGS FOR INCOMING CONNECTIONS
 
 # File with RSA key for SSL
-ssl_private_key_file = /etc/zarafa/ical/privkey.pem
+ssl_private_key_file	=	/home/e-smith/ssl.key/{$SystemName}.{$DomainName}.key
 
-# File with certificate for SSL
-ssl_certificate_file = /etc/zarafa/ical/cert.pem
+#File with certificate for SSL
+ssl_certificate_file	=	/home/e-smith/ssl.crt/{$SystemName}.{$DomainName}.crt
 
 # Verify client certificate
 ssl_verify_client = no
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg.smessl2	2008-12-20 01:56:34.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg	2008-12-20 02:02:41.000000000 +1100
@@ -101,13 +101,13 @@
 server_ssl_port   = { ${'zarafa-server'}{TCPPort} || '237'; }
 
 # Required Server certificate, contains the certificate and the private key parts
-server_ssl_key_file	= /home/e-smith/ssl.pem/{SystemName}.{DomainName}.pem
+server_ssl_key_file	= /home/e-smith/ssl.pem/{$SystemName}.{$DomainName}.pem
 
 # Password of Server certificate
 server_ssl_key_pass	= { ${'zarafa-server'}{DbPassword}; }
 
 # Required Certificate Authority of server
-server_ssl_ca_file	= /home/e-smith/ssl.crt/{SystemName}.{DomainName}.crt
+server_ssl_ca_file	= /home/e-smith/ssl.crt/{$SystemName}.{$DomainName}.crt
 
 # Path with CA certificates, e.g. /etc/ssl/certs
 server_ssl_ca_path	= /home/e-smith/ssl.crt
@@ -180,10 +180,10 @@
 
 # configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
 { 
-  if (${'zarafa-server'}{Plugin} || 'db' eq 'unix')
-  { user_plugin_config	= /etc/zarafa/unix.cfg }
+  if (( ${'zarafa-server'}{Plugin} || 'db' ) eq 'unix')
+  { 'user_plugin_config	= /etc/zarafa/unix.cfg'; }
   else
-  { user_plugin_config	= /etc/zarafa/ldap.cfg }
+  { 'user_plugin_config	= /etc/zarafa/ldap.cfg'; }
 } 
 
 # location of the zarafa plugins