$OpenBSD: patch-installer_linux_server_cfg,v 1.24 2016/04/20 18:38:41 robert Exp $
--- installer/linux/server.cfg.orig	Wed Apr 20 20:02:28 2016
+++ installer/linux/server.cfg	Wed Apr 20 20:04:08 2016
@@ -36,7 +36,7 @@ allow_local_users	= yes
 # local admin users who can connect to any store (use this for the zarafa-dagent)
 # field is SPACE separated
 # eg: local_admin_users = root vmail
-local_admin_users	= root zarafa
+local_admin_users	= root _zarafa
 
 # The user has full rights on a folder by default, uncomment the following line to disable this. 
 # owner_auto_full_access = false 
@@ -46,16 +46,16 @@ owner_auto_full_access = true
 system_email_address	= postmaster@localhost
 
 # drop privileges and run the process as this user
-#run_as_user		= zarafa
+run_as_user		= _zarafa
 
 # drop privileges and run the process as this group
-#run_as_group		= zarafa
+run_as_group		= _zarafa
 
 # create a pid file for stopping the service via the init.d scripts
-#pid_file		= /var/run/zarafad/server.pid
+pid_file		= /var/run/zarafad/server.pid
 
 # run server in this path (when not using the -F switch)
-#running_path = /var/lib/zarafa
+running_path = /var/empty
 
 # create memory coredumps upon crash in the running_path directory
 coredump_enabled = yes
@@ -66,7 +66,7 @@ coredump_enabled = yes
 session_timeout		= 300
 
 # Socket to connect to license server
-license_socket		= /var/run/zarafad/licensed.sock
+#license_socket		= /var/run/zarafad/licensed.sock
 
 # Time (in seconds) to wait for a connection to the license server before 
 # terminating the request.
@@ -148,7 +148,7 @@ attachment_files_fsync  = yes
 # When attachment_storage is 'files', use this path to store the files
 # When attachment_storage is 's3', use this path to set a prefix to all
 # attachment data of a certain cluster, for example 'attach'
-attachment_path         = /var/lib/zarafa/attachments
+attachment_path         = /var/db/zarafa/attachments
 
 # Compression level for attachments when attachment_storage is 'files'.
 # Set compression level for attachments disabled=0, max=9
@@ -185,13 +185,13 @@ server_ssl_enabled	= no
 server_ssl_port		= 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	= ${SYSCONFDIR}/zarafa/ssl/server.pem
 
 # Password of Server certificate
 server_ssl_key_pass	= replace-with-server-cert-password
 
 # Required Certificate Authority of server
-server_ssl_ca_file	= /etc/zarafa/ssl/cacert.pem
+server_ssl_ca_file	= ${SYSCONFDIR}/zarafa/ssl/cacert.pem
 
 # Path with CA certificates, e.g. /etc/ssl/certs
 server_ssl_ca_path	=
@@ -206,7 +206,7 @@ server_ssl_ciphers = ALL:!LOW:!SSLv2:!EXP:!aNULL
 server_ssl_prefer_server_ciphers = no
 
 # Path of SSL Public keys of clients
-sslkeys_path		= /etc/zarafa/sslkeys
+sslkeys_path		= ${SYSCONFDIR}/zarafa/sslkeys
 
 ##############################################################
 # THREAD SETTINGS
@@ -338,20 +338,20 @@ companyquota_warn      = 0
 user_plugin		= db
 
 # configuration file of the user plugin, examples can be found in /usr/share/doc/zarafa/example-config
-user_plugin_config	= /etc/zarafa/ldap.cfg
+user_plugin_config	= ${SYSCONFDIR}/zarafa/ldap.cfg
 
 # location of the zarafa plugins
 # if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa
-plugin_path		= /usr/lib/zarafa
+plugin_path		= ${PREFIX}/lib/zarafa
 
 # scripts which create stores for users from an external source
 # used for ldap and unix plugins only
-createuser_script		=	/etc/zarafa/userscripts/createuser
-deleteuser_script		=	/etc/zarafa/userscripts/deleteuser
-creategroup_script		=	/etc/zarafa/userscripts/creategroup
-deletegroup_script		=	/etc/zarafa/userscripts/deletegroup
-createcompany_script	=	/etc/zarafa/userscripts/createcompany
-deletecompany_script	=	/etc/zarafa/userscripts/deletecompany
+createuser_script		=	${SYSCONFDIR}/zarafa/userscripts/createuser
+deleteuser_script		=	${SYSCONFDIR}/zarafa/userscripts/deleteuser
+creategroup_script		=	${SYSCONFDIR}/zarafa/userscripts/creategroup
+deletegroup_script		=	${SYSCONFDIR}/zarafa/userscripts/deletegroup
+createcompany_script	=	${SYSCONFDIR}/zarafa/userscripts/createcompany
+deletecompany_script	=	${SYSCONFDIR}/zarafa/userscripts/deletecompany
 
 # Set this option to 'yes' to skip the creation and deletion of new users
 # The action will be logged, so you can see if your changes to the plugin
@@ -408,7 +408,7 @@ client_update_enabled = false
 
 # Place the correct Zarafa Outlook Client in this directory for
 # Windows clients to download through the Zarafa server
-client_update_path = /var/lib/zarafa/client
+client_update_path = /var/db/zarafa/client
 
 # Recieve update information from the client (0 = disabled, 1 = only on error, 2 = log always)
 client_update_log_level = 1
