--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort.smessl	2008-12-20 01:12:53.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort	2008-12-20 01:13:03.000000000 +1100
@@ -1 +1 @@
-144
+143
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/status.smessl	2008-12-20 01:16:21.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/status	2008-12-20 01:14:22.000000000 +1100
@@ -0,0 +1 @@
+enabled
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/type.smessl	2008-12-20 01:16:35.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/type	2008-12-20 01:14:22.000000000 +1100
@@ -0,0 +1 @@
+service
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/access.smessl	2008-12-20 01:16:07.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/access	2008-12-20 01:14:51.000000000 +1100
@@ -0,0 +1 @@
+ssl
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg.smessl	2008-12-20 00:28:12.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg	2008-12-20 01:10:02.000000000 +1100
@@ -3,7 +3,7 @@
 
 server_bind	=	0.0.0.0
 
-server_socket	=	http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa
+server_socket	=	http://localhost:{${'zarafa-server'}{TCPport}||'237';}/zarafa
 
 # drop privileges and run the process as this user
 run_as_user = 
@@ -19,19 +19,19 @@
 
 # enable/disable POP3, and POP3 listen port
 pop3_enable	=  { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-pop3_port	 =	 { ${'zarafa-gateway'}{pop3port} || '8110'; }
+pop3_port	 =	 { ${'zarafa-gateway'}{pop3port} || '110'; }
 
 # enable/disable Secure POP3, and Secure POP3 listen port
 pop3s_enable	=	{ if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-pop3s_port	 =	 { ${'zarafa-gateway'}{pop3sport} || '8995'; }
+pop3s_port	 =	 { ${'zarafa-gateway'}{pop3sport} || '995'; }
 
 # enable/disable IMAP, and IMAP listen port
 imap_enable	=	{ if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-imap_port	 =	{ ${'zarafa-gateway'}{imapport} || '144'; }
+imap_port	 =	{ ${'zarafa-gateway'}{imapport} || '143'; }
 
 # enable/disable Secure IMAP, and Secure IMAP listen port
 imaps_enable	=	{ if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-imaps_port	=	 { ${'zarafa-gateway'}{imapsport} || '8993'; }
+imaps_port	=	 { ${'zarafa-gateway'}{imapsport} || '993'; }
 
 # Only mail folder for IMAP or all subfolders (calendar, contacts, tasks, etc. too)
 imap_only_mailfolders	=	yes
@@ -43,10 +43,10 @@
 imap_capability_idle = yes
 
 # File with RSA key for SSL
-ssl_private_key_file	=	/etc/zarafa/gateway/privkey.pem
+ssl_private_key_file	=	/home/e-smith/ssl.key/{SystemName}.{DomainName}.key
 
 #File with certificate for SSL
-ssl_certificate_file	=	/etc/zarafa/gateway/cert.pem
+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.smessl	2008-12-20 00:35:15.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg	2008-12-20 01:09:48.000000000 +1100
@@ -10,7 +10,7 @@
 server_tcp_enabled	= yes
 
 # Port to bind to
-server_tcp_port   = { ${'zarafa-server'}{TCPPort} || '236'; }
+server_tcp_port   = { ${'zarafa-server'}{TCPPort} || '237'; }
 
 # Accept unix pipe connections (not recommended to disable)
 server_pipe_enabled	= yes
@@ -98,22 +98,22 @@
 server_ssl_enabled	= no
 
 # Listen for SSL connections on this port
-server_ssl_port   = { ${'zarafa-server'}{SSLPort} || '237'; }
+server_ssl_port   = { ${'zarafa-server'}{TCPPort} || '237'; }
 
 # Required Server certificate, contains the certificate and the private key parts
-server_ssl_key_file	= /etc/zarafa/ssl/server.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	= /etc/zarafa/ssl/demoCA/cacert.pem
+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	=
+server_ssl_ca_path	= /home/e-smith/ssl.crt
 
 # Path of SSL Public keys of clients
-sslkeys_path		= /etc/zarafa/sslkeys
+sslkeys_path		= /home/e-smith/ssl.pem
 
 
 ##############################################################
@@ -179,7 +179,12 @@
 user_plugin   = { ${'zarafa-server'}{Plugin} || 'db'; }
 
 # configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
-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 }
+} 
 
 # location of the zarafa plugins
 # if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa