Index: npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+if [ `cat /var/lib/mon/alerts/zarafa/state` == "ALERT" ]; then
+	echo "Something is wrong with zarafa..not doing anything"
+	exit 1
+fi
+
+abort()
+{
+	syn3-state zarafa CAUTION "Zarafa onderhoud gaf een probleem: $1"
+	exit 1
+}
+
+TXT="Zarafa onderhoud gestart, uw server kan iets langzamer zijn tijdens dit process:"
+
+#sql fix for zarafa upgrade: http://doc.zarafa.com/7.0/Release_Notes/en-US/html-single/
+if ! [ -e /var/lib/zarafa/zarafa_upgrade_fix ]; then
+	syn3-state zarafa OK "$TXT zarafa 7 upgrade bugfix aan het uitvoeren (eenmalig)" 
+	mysql -p`cat /etc/my.passwd` zarafa -e "
+		begin;
+		truncate table tproperties;
+		alter table tproperties drop primary key, add primary key (folderid, tag,hierarchyid,type);
+		INSERT IGNORE INTO deferredupdate (hierarchyid, folderid) SELECT c.id,c.parent FROM hierarchy AS c JOIN hierarchy AS p ON c.parent = p.id AND p.type=3;
+		commit;" || abort "upgrade fix mislukt"
+	touch /var/lib/zarafa/zarafa_upgrade_fix
+fi
+
+syn3-state zarafa OK "$TXT purge deferred aan het uitvoeren" 
+zarafa-admin --purge-deferred
+# always exitcode 1?
+# || abort "purge deferred mislukt"
+
+syn3-state zarafa OK "$TXT softdelete aan het uitvoeren"
+zarafa-admin --purge-softdelete 30 || abort "softdelete mislukt"
+
+syn3-state zarafa OK "$TXT database optimalisatie"
+mysqlcheck --optimize -p`cat /etc/my.passwd` zarafa || abort "database optimalisatie mislukt"
+
+syn3-state zarafa OK "$TXT zarafa search xapian compact"
+svcstop /service/zarafa-search/
+zarafa-search-xapian-compact.py || abort "zarafa search xapian compact mislukt"
+chown -R zarafa:zarafa /home/system/zarafa_index/
+svcreset /service/zarafa-search/
+
+
+syn3-state zarafa OK "$TXT z-push cleanup"
+z-push-admin -a fixstates || abort "z-push cleanup mislukt"
+
+syn3-state zarafa OK "Zarafa onderhoud succesvol voltooid."
+
+exit 0
Index: npl/mailserver/zarafa_conf7/root/etc/cyrus-conv.conf
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/cyrus-conv.conf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/cyrus-conv.conf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,28 @@
+# Syn-3: Temporary settings for mail migration
+
+
+START {
+  # do not delete this entry!
+  recover	cmd="ctl_cyrusdb -r"
+
+  # this is only necessary if using idled for IMAP IDLE
+  #idled		cmd="idled"
+}
+
+# UNIX sockets start with a slash and are put into /var/imap/socket
+SERVICES {
+  # add or remove based on preferences
+  imap		cmd="imapd" listen="20143" prefork=0
+}
+
+EVENTS {
+  # this is required
+  checkpoint	cmd="ctl_cyrusdb -c" period=30
+
+  # this is only necessary if using duplicate delivery suppression,
+  # Sieve or NNTP
+  delprune	cmd="cyr_expire -E 3" at=0400
+
+  # this is only necessary if caching TLS sessions
+  tlsprune	cmd="tls_prune" at=0400
+}
Index: npl/mailserver/zarafa_conf7/root/etc/mapi/zarafa.inf
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/mapi/zarafa.inf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/mapi/zarafa.inf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,39 @@
+[Services]
+ZARAFA6=Zarafa Server
+
+# Service
+[ZARAFA6]
+PR_DISPLAY_NAME=Zarafa Server
+PR_SERVICE_DLL_NAME=zarafa6client.dll
+PR_SERVICE_SO_NAME=libzarafaclient.so
+PR_SERVICE_ENTRY_NAME=MSGServiceEntry
+PR_RESOURCE_FLAGS=SERVICE_SINGLE_COPY|SERVICE_PRIMARY_IDENTITY
+# windows also has: ZARAFA6_MSXP, ZARAFA6_MSMDB_Delegate
+Providers=ZARAFA6_ABP, ZARAFA6_MSMDB_private, ZARAFA6_MSMDB_public
+
+# Provider
+[ZARAFA6_ABP]
+PR_PROVIDER_DISPLAY=Zarafa Directory Service
+PR_RESOURCE_TYPE=MAPI_AB_PROVIDER
+PR_DISPLAY_NAME=Zarafa Directory Service
+PR_AB_PROVIDER_ID=AC21A95040D3EE48B319FBA753304425
+
+# Provider
+[ZARAFA6_MSMDB_private]
+PR_PROVIDER_DISPLAY=Zarafa Message Store
+PR_RESOURCE_TYPE=MAPI_STORE_PROVIDER
+PR_MDB_PROVIDER=CA3D253C27D23C4494FE425FAB958C19
+PR_RESOURCE_FLAGS=STATUS_PRIMARY_IDENTITY|STATUS_DEFAULT_STORE|STATUS_PRIMARY_STORE
+PR_DISPLAY_NAME=Private Folders
+660A0003=01000000
+66090003=0C000000
+
+# Provider
+[ZARAFA6_MSMDB_public]
+PR_PROVIDER_DISPLAY=Zarafa Message Store
+PR_RESOURCE_TYPE=MAPI_STORE_PROVIDER
+PR_MDB_PROVIDER=094A7FD4BDD33C49B2FC3C90BBCB48D4
+PR_RESOURCE_FLAGS=STATUS_NO_DEFAULT_STORE
+PR_DISPLAY_NAME=Public Folders
+660A0003=03000000
+66090003=06000000
Index: npl/mailserver/zarafa_conf7/root/etc/mapi/zcontacts.inf
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/mapi/zcontacts.inf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/mapi/zcontacts.inf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,17 @@
+[Services]
+ZCONTACTS=Zarafa Contacts Addressbook
+
+# service
+[ZCONTACTS]
+PR_DISPLAY_NAME=Zarafa Contacts Addressbook
+PR_SERVICE_DLL_NAME=libzarafacontacts.so
+PR_SERVICE_ENTRY_NAME=MSGServiceEntry
+PR_RESOURCE_FLAGS=SERVICE_SINGLE_COPY|SERVICE_PRIMARY_IDENTITY
+Providers=ZARAFA_CONTACTS_ABP
+
+# Provider
+[ZARAFA_CONTACTS_ABP]
+PR_PROVIDER_DISPLAY=Zarafa Contacts Directory Service
+PR_RESOURCE_TYPE=MAPI_AB_PROVIDER
+PR_DISPLAY_NAME=Zarafa Contacts Directory Service
+PR_AB_PROVIDER_ID=727F0430E3924FDAB86AE52A7FE46571
Index: npl/mailserver/zarafa_conf7/root/etc/php5/mapi.ini
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/php5/mapi.ini	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/php5/mapi.ini	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,3 @@
+; Zarafa mail API support
+extension=mapi.so
+
Index: npl/mailserver/zarafa_conf7/root/etc/postinst.d/post.zarafa_conf
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/postinst.d/post.zarafa_conf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/postinst.d/post.zarafa_conf	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,118 @@
+#!/bin/bash
+/sbin/postinst.sh post.openldap || exit 1
+
+ldconfig #neccesary to fix hang-problems after updates?
+
+####### Cyrus stuff
+#make sure zarafa imap stays down if the server uses cyrus
+if svstat /service/cyrus-imapd/|grep up; then
+	svcstop /service/zarafa-gateway || exit 1
+	touch /service/zarafa-gateway/down
+fi
+
+
+
+############ SQL STUFF
+svcstart /service/mysql || exit 1
+
+echo | syn3-mysqlcreate zarafa /etc/zarafa/server.cfg || exit 1
+
+
+############# ZARAFA STUFF
+
+useradd zarafa 
+groupadd zarafa 
+useradd zarafa-gateway
+
+#secure config permissions
+chown root /etc/zarafa/server.cfg || exit 1
+chmod 700 /etc/zarafa/server.cfg || exit 1
+chown zarafa /var/lib/zarafa
+mkdir /var/run/zarafad 2>/dev/null
+chmod 775 /var/run/zarafad
+chown zarafa:zarafa /var/run/zarafad
+
+#logging
+mkdir /var/log/zarafa
+chown zarafa /var/log/zarafa || exit 1
+touch /var/log/zarafa/gateway.log || exit 1
+chown zarafa-gateway /var/log/zarafa/gateway.log || exit 1
+
+#attachments
+mkdir /home/system/zarafa 
+chown zarafa /home/system/zarafa || exit 1
+
+#search index
+mkdir /home/system/zarafa_index
+chown zarafa /home/system/zarafa_index || exit 1
+
+#create public store (first time only)
+svcstart /service/zarafa-server || exit 1
+zarafa-admin -s 
+
+svcreset /service/zarafa-server
+svcreset /service/mysql
+
+#remove old indexer stuff
+svc -d /service/zarafa-indexer &>/dev/null
+rm -rf /service/zarafa-indexer/ &>/dev/null
+
+#licensed 
+rm -rf /service/zarafa-licenced #typo
+
+#remove obsolete mobile stuff
+rm -rf /var/www/htdocs/syn3/zarafa-mobile/ &>/dev/null
+
+#webapp stuff
+mkdir -p /home/system/zarafa_webapp &>/dev/null
+chown nobody /home/system/zarafa_webapp
+
+#dagent stuff
+touch /var/log/zarafa/dagent.log
+chown alias /var/log/zarafa/dagent.log
+#zarafa-dagent expect autoresponder in differen place (weird)
+ln -s /usr/bin/zarafa-autorespond /usr/sbin/zarafa-autorespond 2>/dev/null
+
+#spamd stuff
+mkdir /home/system/zarafa_spamd
+chown zarafa:zarafa /home/system/zarafa_spamd
+chmod 700 /home/system/zarafa_spamd
+
+############## APACHE PHP STUFF
+#restart apache to activate php mapi extention
+svcrestart /service/apache2
+
+
+####### LDAP STUFF
+# do this as last, since its the least important. (zarafa works without it)
+
+#restart slapd to activate the zarafa ldap schema
+svcstop /service/slapd || exit 1
+svcstart /service/slapd || exit 1
+smbldap-usermod -Z administrator
+smbldap-usermod -x admin
+smbldap-usermod -x nobody
+smbldap-usermod -x mailadmin
+
+#return ldap to previous mode:
+svcreset /service/slapd || exit 1
+
+######## cleanup
+#old versions leave behind some unused libs
+removepkg /var/log/packages/zarafa7-7.1* /var/log/packages/zarafa-* 2>/dev/null
+touch /var/log/packages/zarafa-999-i586-9999 #prevent reinstall
+rm /usr/lib/libzarafaclient.so /usr/lib/libzarafacontacts.so 2>/dev/null
+
+#old webapp plugins give conflicts
+removepkg /var/log/packages/zarafa_webapp-1* /var/log/packages/zarafa_webapp-2.1.*
+cd /var/www/htdocs/syn3/zarafa_webapp/plugins/
+rm -rf example/ zperformance/ webodf/ twidget/ spreed/ shellgame/ salesforce/ oauthlib/ feedback/ facebook/ extbox/ dropboxattachment/ sugarcrm/ statslogging/ facebookwidget/ pdfbox/
+cd
+
+#delete old indexer index db 
+rm /home/system/zarafa_index/state-* /home/system/zarafa_index/*.kct /home/system/zarafa_index/*.tmpkct 2>/dev/null
+
+
+
+
+exit 0
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/backup.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/backup.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/backup.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,13 @@
+
+# Login to the Zarafa server using this SSL Key
+#sslkey_file = /etc/zarafa/ssl/backup.pem
+
+# The password of the SSL Key
+#sslkey_pass = replace-with-server-cert-password
+
+# Only backup stores from these servers. Leave blank for any server.
+# Only used when backing up all users, or a full company.
+backup_servers = 
+
+# Use multiple threads when backing up multiple stores.
+threads = 1
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/dagent.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/dagent.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/dagent.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,98 @@
+##############################################################
+# DAGENT SETTINGS
+
+
+##############################################################
+# DAGENT SSL LOGIN SETTINGS
+# 
+# Note: server_socket must be set to https://servername:portname/zarafa
+#       to use this type of login method
+
+# Login to the Zarafa server using this SSL Key
+#sslkey_file = /etc/zarafa/ssl/dagent.pem
+
+# The password of the SSL Key
+#sslkey_pass = replace-with-dagent-cert-password
+
+##############################################################
+# DAGENT LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method	=	file
+
+# Loglevel (0=no logging, 5=full logging)
+log_level	=	2
+
+# Logfile for log_method = file, use '-' for stderr
+log_file	=	-
+log_file = /var/log/zarafa/dagent.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp	=	1
+
+##############################################################
+# DAGENT LMTP SETTINGS
+#  start dagent with -d to create an lmtp daemon of the zarafa-dagent
+
+# binding address for LMTP daemon
+# change to 0.0.0.0 if you require connections over the network
+server_bind = 127.0.0.1
+
+# LMTP port to listen on for LMTP connections
+lmtp_port = 2003
+
+# Maximum LMTP threads that ca be running simultaneously
+# This is also limited by your SMTP server. (20 is the postfix default concurrency limit)
+lmtp_max_threads = 20
+
+# Process model for LMTP daemon, using pthreads (thread) or processes (fork)
+process_model = fork
+
+# run as specific user in LMTP mode.
+#   make sure this user is listed in local_admin_users in your zarafa server config
+#   or use SSL connections with certificates to login
+run_as_user =
+
+# run as specific group in LMTP mode.
+run_as_group =
+
+
+# The following e-mail header will mark the mail as spam, so the mail
+# is placed in the Junk Mail folder, and not the Inbox.
+# The name is case insensitive.
+# set to empty to not use this detection scheme.
+spam_header_name = 
+
+# If the above header is found, and contains the following value
+# the mail will be considered as spam.
+# Notes: 
+#  - The value is case insensitive.
+#  - Leading and trailing spaces are stripped.
+#  - The word 'bayes' also contains the word 'yes'.
+spam_header_value = No
+
+### For debugging
+# Log raw message to a file
+log_raw_message = no
+# Log raw messages path
+log_raw_message_path = /tmp
+
+# messages on delivery.
+# This will do nothing if no archive is attached to the target mailbox.
+archive_on_delivery = no
+
+##############################################################
+# DAGENT PLUGIN SETTINGS
+# Enable the dagent plugin framework
+plugin_enabled = no
+# Path to the dagent plugin manager
+plugin_manager_path = /usr/share/zarafa-dagent/python
+# Path to the activated dagent plugins.
+#   This folder contains symlinks to the zarafa plugins and custom scripts. The plugins are
+#   installed in '/usr/share/zarafa-dagent/python/plugins/'. To activate a plugin create a symbolic
+#   link in the 'plugin_path' directory.
+#
+# Example:
+#  $ ln -s /usr/share/zarafa-dagent/python/plugins/BMP2PNG.py /var/lib/zarafa/dagent/plugins/BMP2PNG.py
+plugin_path = /var/lib/zarafa/dagent/plugins
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/gateway-conv.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/gateway-conv.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/gateway-conv.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,69 @@
+# Syn-3: Special settings for email migration without password login and imapsync
+# ONLY USED DURING CONVERSION OF MAIL
+
+
+server_bind	=	127.0.0.1
+
+
+# drop privileges and run the process as this user
+run_as_user = root
+
+# drop privileges and run the process as this group
+run_as_group = root
+
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+# enable/disable POP3, and POP3 listen port
+pop3_enable	=	no
+pop3_port	=	110
+
+# enable/disable Secure POP3, and Secure POP3 listen port
+pop3s_enable	=	no
+#pop3s_port	=	10143
+
+# enable/disable IMAP, and IMAP listen port
+imap_enable	=	no
+#imap_port	=	10143
+
+# enable/disable Secure IMAP, and Secure IMAP listen port
+imaps_enable	=	yes
+imaps_port	=	10143
+
+# Only mail folder for IMAP or all subfolders (calendar, contacts, tasks, etc. too)
+imap_only_mailfolders	=	yes
+
+# Show Public folders for IMAP
+imap_public_folders	=	no
+
+# IMAP clients may use IDLE command
+imap_capability_idle = no
+
+# File with RSA key for SSL
+ssl_private_key_file	=	/usr/webint/ssl/server.pem
+
+#File with certificate for SSL
+ssl_certificate_file	=	/usr/webint/ssl/server.crt
+
+# Verify client certificate
+ssl_verify_client	=	no
+
+# Client verify file and/or path
+ssl_verify_file		=	
+ssl_verify_path		=
+
+##############################################################
+# GATEWAY LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method	=	file
+
+# Loglevel (0=no logging, 5=full logging)
+log_level	=	2
+
+# Logfile for log_method = file, use '-' for stderr
+log_file	=	/var/log/zarafa/gateway-conv.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp	=	1
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/gateway.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/gateway.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/gateway.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,79 @@
+##############################################################
+# GATEWAY SETTINGS
+
+server_bind	=	0.0.0.0
+
+# WARNING!! YOU MUST RUN ZARAFA GATEWAY UNDER A DIFFERENT USER THAN THE SERVER PROCESS
+# drop privileges and run the process as this user
+run_as_user = zarafa-gateway
+
+# drop privileges and run the process as this group
+run_as_group = zarafa-gateway
+
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+# enable/disable POP3, and POP3 listen port
+pop3_enable	=	yes
+pop3_port	=	110
+
+# enable/disable Secure POP3, and Secure POP3 listen port
+pop3s_enable	=	yes
+pop3s_port	=	995
+
+# enable/disable IMAP, and IMAP listen port
+imap_enable	=	yes
+imap_port	=	143
+
+# enable/disable Secure IMAP, and Secure IMAP listen port
+imaps_enable	=	yes
+imaps_port	=	993
+
+# Only mail folder for IMAP or all subfolders (calendar, contacts, tasks, etc. too)
+imap_only_mailfolders	=	yes
+
+# Show Public folders for IMAP
+imap_public_folders	=	yes
+
+# IMAP clients may use IDLE command
+imap_capability_idle = yes
+
+# File with RSA key for SSL
+ssl_private_key_file	=	/usr/webint/ssl/server.pem
+
+#File with certificate for SSL
+ssl_certificate_file	=	/usr/webint/ssl/server.crt
+
+# Verify client certificate
+ssl_verify_client	=	no
+
+# Client verify file and/or path
+ssl_verify_file		=	
+ssl_verify_path		=
+
+# Process model, using pthreads (thread) or processes (fork)
+process_model = fork
+
+
+imap_store_rfc822=yes
+
+
+##############################################################
+# GATEWAY LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method	=	file
+
+# Loglevel (0=no logging, 5=full logging)
+log_level	=	2
+
+# Logfile for log_method = file, use '-' for stderr
+log_file	=	/var/log/zarafa/gateway.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp	=	1
+
+
+
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/ical.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/ical.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/ical.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,76 @@
+##############################################################
+# ICAL SETTINGS
+
+# drop privileges and run the process as this user
+run_as_user = zarafa
+
+# drop privileges and run the process as this group
+run_as_group = zarafa
+
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+# IP Address to bind to (0.0.0.0 for ANY)
+server_bind = 0.0.0.0
+
+# wether normal connections can be made to the ical server
+ical_enable = yes
+
+# port which the ical server listens on for normal connections
+ical_port = 8008
+
+# wether ssl connections can be made to the ical server
+icals_enable = yes
+
+# port which the ical server listens on for ssl connections
+icals_port = 8443
+
+# default connection to the Zarafa server
+server_socket = http://localhost:236/zarafa
+
+# Process model, using pthreads (thread) or processes (fork)
+process_model = fork
+
+enable_ical_get=yes
+
+##############################################################
+# ICAL LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method = file
+
+# Loglevel (0=no logging, 5=full logging)
+log_level = 2
+
+# Logfile for log_method = file, use '-' for stderr
+log_file = /var/log/zarafa/ical.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp = 1
+
+##############################################################
+# ICAL SSL SETTINGS FOR INCOMING CONNECTIONS
+
+# File with RSA key for SSL
+ssl_private_key_file = /usr/webint/ssl/server.pem
+
+# File with certificate for SSL
+ssl_certificate_file = /usr/webint/ssl/server.crt
+
+# Verify client certificate
+ssl_verify_client = no
+
+# Client verify file and/or path
+ssl_verify_file = 
+ssl_verify_path =
+
+##############################################################
+# OTHER ICAL SETTINGS
+
+# The timezone of the system clock
+server_timezone = Europe/Amsterdam
+
+# The charset of data to expect when the client doesn't specify any
+default_charset = utf-8
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/ldap.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/ldap.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/ldap.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,454 @@
+##############################################################
+#  LDAP/ACTIVE DIRECTORY USER PLUGIN SETTINGS
+#
+# Any of these directives that are required, are only required if the
+# userplugin parameter is set to ldap.
+
+# LDAP host name/IP address
+# Optional, default = localhost
+#ldap_host = ldap-master
+
+# LDAP port
+# Optional, default = 389
+# Use 636 for ldaps
+#ldap_port = 389
+
+# LDAP protocol
+# Optional, default = ldap
+# use 'ldaps' for SSL encryption. Make sure /etc/ldap/ldap.conf is
+# configured correctly with TLS_CACERT
+#ldap_protocol = ldap
+
+ldap_uri = ldap://ldap-master:389 ldap://ldap-slave:389
+
+
+# The charset that strings are stored in on the LDAP server. Normally this
+# is utf-8, but this can differ according to your setup. The charset specified
+# here must be supported by your iconv(1) setup. See iconv -l for all charset
+ldap_server_charset = utf-8
+
+# The DN of the user to bind as for normal operations (not used for
+# authentication if ldap_authentication_method is set to "bind"
+# Optional, default = empty (anonymous bind)
+# The userPassword attribute must be readable for this user if the
+# ldap_authentication_method option is set to password.
+#ldap_bind_user = cn=admin,cn=users,dc=zarafa,dc=com
+ldap_bind_user =
+
+# LDAP bind password
+# Optional, default = empty (no password)
+ldap_bind_passwd = 
+
+# The timeout for network operations in seconds
+ldap_network_timeout = 30
+
+# When an object (user/group/company) is changed, this attribute will also change:
+# Active directory: uSNChanged
+# LDAP: modifyTimestamp
+ldap_last_modification_attribute = modifyTimestamp
+
+##########
+# Object settings
+
+# Top level search base, every object should be available under this tree
+ldap_search_base = dc=syn-3
+
+# attribute name which is used in ldap_user_search_filter
+ldap_object_type_attribute = objectClass
+#(use shadowAccount instead of posixAccount, because samba-computers are also accounts!)
+ldap_user_type_attribute_value = shadowAccount  
+ldap_group_type_attribute_value = posixGroup
+ldap_contact_type_attribute_value = zarafa-contact
+ldap_company_type_attribute_value = zarafa-company
+ldap_addresslist_type_attribute_value = zarafa-addresslist
+ldap_dynamicgroup_type_attribute_value = zarafa-dynamicgroup
+
+
+##########
+# There should be no need to edit any values below this line
+##########
+
+##########
+# User settings
+
+# Extra search for users using this LDAP filter.  See ldap_search(3) or RFC
+# 2254 for details on the filter syntax.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa users.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Person)
+# For LDAP with posix users:
+#   no need to use the search filter.
+ldap_user_search_filter = 
+
+# unique user id for find the user
+# Required
+# For active directory, use:
+#    objectGuid ** WARNING: This WAS: objectSid ** Updates *WILL* fail! **
+# For LDAP with posixAccount, use:
+#    uidNumber
+ldap_user_unique_attribute = uidNumber
+
+# Type of unique user id
+# default: text
+# For active directory, use:
+#		binary
+# For LDAP with posix user, use:
+#		text
+ldap_user_unique_attribute_type = text
+
+# Optional, default = cn
+# For active directory, use:
+#   cn or displayName
+# For LDAP with posix user, use:
+#   cn
+ldap_fullname_attribute = cn
+
+# Optional, default = uid
+# Active directory: sAMAccountName
+# LDAP: uid
+ldap_loginname_attribute = uid
+
+# Optional, default = userPassword
+# Active directory: unicodePwd
+# LDAP: userPassword
+ldap_password_attribute = userPassword
+
+# If set to bind, users are authenticated by trying to bind to the
+# LDAP tree using their username + password.  Otherwise, the
+# ldap_password_attribute is requested and checked.
+# Optional, default = bind
+# Choices: bind, password
+# Active directory: bind
+# LDAP: password
+#ldap_authentication_method = password
+ldap_authentication_method = bind
+
+# Optional, default = mail
+# Active directory: mail
+# LDAP: mail
+ldap_emailaddress_attribute = mail
+
+# Optional, default = zarafaAliases
+# Active directory: zarafaAliases
+# LDAP: zarafaAliases
+# DatuX: 3-oct-2011: Disabled this because it causes zarafa to 'resolve' the aliases to the primary adres. This causes confusion and doesnt allow mailrules that filters on such adresses. ( also see https://jira.zarafa.com/browse/ZCP-4850. same 'feature' exists for to-adresses)
+#ldap_emailaliases_attribute = alias
+
+# Whether the user is an admin.  The field is interpreted as a
+# boolean, 0 and false (case insensitive) meaning no, all other values
+# yes.
+# Optional, default = zarafaAdmin
+# Active directory: zarafaAdmin
+# LDAP: zarafaAdmin
+ldap_isadmin_attribute = zarafaAdmin
+
+# Whether a user is a non-active user. This means that the user will
+# not count towards your user count, but the user will also not be
+# able to log in
+# Optional, default = empty
+# Active directory: zarafaSharedStoreOnly
+# LDAP: zarafaSharedStoreOnly
+ldap_nonactive_attribute = zarafaSharedStoreOnly
+
+# A nonactive store, or resource, can be specified to be a user, room or equipment.
+# Set it to 'room' or 'equipment' to make such types. If set to empty,
+# or wrong word, or 'user' it will be a nonactive user.
+# Optional, default = zarafaResourceType
+# Active directory: zarafaResourceType
+# LDAP: zarafaResourceType
+ldap_resource_type_attribute = zarafaResourceType
+
+# Numeric resource capacity
+# Optional, default = zarafaResourceCapacity
+# Active directory: zarafaResourceCapacity
+# LDAP: zarafaResourceCapacity
+ldap_resource_capacity_attribute = zarafaResourceCapacity
+
+# Optional
+# The attribute which indicates which users are allowed
+# to send on bahalf of the selected user
+ldap_user_sendas_attribute = zarafaSendAsPrivilege
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_user_sendas_attribute_type = text
+
+# The attribute of the user which is listed in the
+# ldap_user_sendas_attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_user_sendas_relation_attribute = uid
+
+# Optional, default = userCertificate
+# Active directory: userCertificate
+# LDAP: userCertificate
+ldap_user_certificate_attribute = userCertificate
+
+# Load extra user properties from the propmap file
+#!propmap /etc/zarafa/ldap.propmap.cfg
+
+##########
+# Group settings
+
+# Search for groups using this LDAP filter.  See ldap_search(3) for
+# details on the filter syntax.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa groups.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Group)
+# For LDAP with posix groups, use:
+#   no need to set the search filter
+ldap_group_search_filter = 
+
+# unique group id for find the group
+# Required
+# For active directory, use:
+#    objectSid
+# For LDAP with posix group, use:
+#    gidNumber
+ldap_group_unique_attribute = gidNumber
+
+# Type of unique group id
+# default: text
+# For active directory, use:
+#		binary
+# For LDAP with posix group, use:
+#		text
+ldap_group_unique_attribute_type = text
+
+# Optional, default = cn
+# Active directory: cn
+# LDAP: cn
+ldap_groupname_attribute = cn
+
+# Optional, default = member
+# Active directory: member
+# LDAP: memberUid
+ldap_groupmembers_attribute = memberUid
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_groupmembers_attribute_type = text
+
+# The attribute of the user which is listed in ldap_groupmember_attribute
+# Active directory: empty, matching dn's
+# LDAP: uidNumber, matching users in ldap_user_unique_attribute
+ldap_groupmembers_relation_attribute = uid
+
+# A group can also be used for security, eg. setting permissions on folders.
+# This makes a group a security group. The zarafaSecurityGroup value is boolean.
+# Optional, default = zarafaSecurityGroup
+# Active directory = groupType
+# LDAP: zarafaSecurityGroup
+ldap_group_security_attribute = zarafaSecurityGroup
+
+# In ADS servers, a special bitmask action is required on the groupType field.
+# This is actived by setting the ldap_group_security_attribute_type to `''ads`''
+# Otherwise, just the presence of the field will make the group security enabled.
+# Optional, default = boolean
+# Active directory = ads
+# LDAP: boolean
+ldap_group_security_attribute_type = boolean
+
+##########
+# Company settings
+
+# Search for companies using this LDAP filter.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa companies.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Company)
+# For LDAP with posix users, use:
+#   no need to set the filter
+ldap_company_search_filter =
+
+# unique company id for find the company
+# Active directory: objectGUID
+# LDAP: ou
+ldap_company_unique_attribute = ou
+
+# Optional, default = text
+# Active directory: binary
+# LDAP: text
+ldap_company_unique_attribute_type = text
+
+# Optional, default = ou
+# Active directory: ou
+# LDAP: ou
+ldap_companyname_attribute = ou
+
+# Optional
+# The attribute which indicates which companies are allowed
+# to view the members of the selected company
+ldap_company_view_attribute = zarafaViewPrivilege
+
+# Optional, default = text
+ldap_company_view_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_view_attribute
+# Empty default, using ldap_company_unique_attribute
+ldap_company_view_relation_attribute =
+
+# Optional
+# The attribute which indicates which users from different companies
+# are administrator over the selected company.
+ldap_company_admin_attribute = zarafaAdminPrivilege
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_company_admin_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_admin_attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_company_admin_relation_attribute = 
+
+# The attribute which indicates which user is the system administrator
+# for the specified company.
+ldap_company_system_admin_attribute = zarafaSystemAdmin
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_company_system_admin_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_system_admin attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_company_system_admin_relation_attribute =
+
+
+##########
+# Addresslist settings
+
+# Add a filter to the addresslist search
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa addresslists.
+# Optional, default = empty (match everything)
+ldap_addresslist_search_filter = 
+
+# This is the unique attribute of a addresslist which is never going
+# to change, unless the addresslist is removed from LDAP. When this
+# value changes, Zarafa will remove the previous addresslist from the
+# database, and create a new addresslist with this unique value
+ldap_addresslist_unique_attribute = cn
+
+# This value can be 'text' or 'binary'. For OpenLDAP, only text is used.
+ldap_addresslist_unique_attribute_type = text
+
+# This is the name of the attribute on the addresslist object that
+# specifies the filter to be applied for this addresslist. All users
+# matching this filter AND matching the default
+# ldap_user_search_filter will be included in the addresslist
+ldap_addresslist_filter_attribute = zarafaFilter
+
+# This is the name of the attribute on the addresslist object that
+# specifies the search base to be applied for this addresslist.
+ldap_addresslist_search_base_attribute = zarafaBase
+
+# The attribute containing the name of the addresslist
+ldap_addresslist_name_attribute = cn
+
+
+##########
+# Dynamicgroup settings
+
+# Add a filter to the dynamicgroup search
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa dynamic groups.
+# Optional, default = empty (match everything)
+ldap_dynamicgroup_search_filter = 
+
+# This is the unique attribute of a dynamicgroup which is never going
+# to change, unless the dynamicgroup is removed from LDAP. When this
+# value changes, Zarafa will remove the previous dynamicgroup from the
+# database, and create a new dynamicgroup with this unique value
+ldap_dynamicgroup_unique_attribute = cn
+
+# This value can be 'text' or 'binary'. For OpenLDAP, only text is used.
+ldap_dynamicgroup_unique_attribute_type = text
+
+# This is the name of the attribute on the dynamicgroup object that
+# specifies the filter to be applied for this dynamicgroup. All users
+# matching this filter AND matching the default
+# ldap_user_search_filter will be included in the dynamicgroup
+ldap_dynamicgroup_filter_attribute = zarafaFilter
+
+# This is the name of the attribute on the dynamicgroup object that
+# specifies the search base to be applied for this dynamicgroup.
+ldap_dynamicgroup_search_base_attribute = zarafaBase
+
+# The attribute containing the name of the dynamicgroup
+ldap_dynamicgroup_name_attribute = cn
+
+
+##########
+# Quota settings
+
+# Optional
+# The attribute which indicates which users (besides the user who exceeds his quota)
+# should also receive a warning mail when a user exceeds his quota.
+ldap_quota_userwarning_recipients_attribute = zarafaQuotaUserWarningRecipients
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_quota_userwarning_recipients_attribute_type = text
+
+# Optional, default empty
+ldap_quota_userwarning_recipients_relation_attribute =
+
+# Optional
+# The attribute which indicates which users should receive a warning mail
+# when a company exceeds his quota.
+ldap_quota_companywarning_recipients_attribute = zarafaQuotaCompanyWarningRecipients
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_quota_companywarning_recipients_attribute_type = text
+
+# Optional, default empty
+ldap_quota_companywarning_recipients_relation_attribute =
+
+# Whether to override the system wide quota settings
+ldap_quotaoverride_attribute = zarafaQuotaOverride
+
+ldap_warnquota_attribute = 
+ldap_softquota_attribute =
+ldap_hardquota_attribute =
+
+# Whether to override the system wide quota settings for all users within the company
+ldap_userdefault_quotaoverride_attribute = zarafaUserDefaultQuotaOverride
+
+ldap_userdefault_warnquota_attribute =
+ldap_userdefault_softquota_attribute =
+ldap_userdefault_hardquota_attribute =
+
+# Mapping from the quota attributes to a number of bytes.  Qmail-LDAP
+# schema uses bytes (1), ADS uses kilobytes (1024*1024).
+ldap_quota_multiplier = 1
+
+##########
+# Misc. settings
+
+# Attribute which indicates if the user should be hidden from addressbook
+ldap_addressbook_hide_attribute = zarafaHidden 
+
+# LDAP object search filter. %s in this filter will be replaced with
+# the object being searched.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa objects.
+# Default: empty
+# ADS recommended: (anr=%s)
+# OpenLDAP optional: (|(mail=%s*)(uid=%s*)(cn=*%s*)(fullname=*%s*)(givenname=*%s*)(lastname=*%s*)(sn=*%s*))
+ldap_object_search_filter = 
+
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/ldapms.active-directory.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/ldapms.active-directory.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/ldapms.active-directory.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,502 @@
+##############################################################
+#  LDAP/ACTIVE DIRECTORY USER PLUGIN SETTINGS
+#
+# Any of these directives that are required, are only required if the
+# userplugin parameter is set to ldap.
+
+# LDAP host name/IP address
+# Optional, default = localhost
+ldap_host = 
+
+# LDAP port
+# Optional, default = 389
+# Use 636 for ldaps
+ldap_port = 389
+
+# LDAP protocol
+# Optional, default = ldap
+# use 'ldaps' for SSL encryption. Make sure /etc/ldap/ldap.conf is
+# configured correctly with TLS_CACERT
+ldap_protocol = ldap
+
+# The charset that strings are stored in on the LDAP server. Normally this
+# is utf-8, but this can differ according to your setup. The charset specified
+# here must be supported by your iconv(1) setup. See iconv -l for all charset
+ldap_server_charset = utf-8
+
+# The DN of the user to bind as for normal operations (not used for
+# authentication if ldap_authentication_method is set to "bind"
+# Optional, default = empty (anonymous bind)
+# The userPassword attribute must be readable for this user if the
+# ldap_authentication_method option is set to password.
+ldap_bind_user = cn=Administrator,cn=users,dc=zarafa,dc=com
+
+# LDAP bind password
+# Optional, default = empty (no password)
+ldap_bind_passwd = 
+
+# The timeout for network operations in seconds
+ldap_network_timeout = 30
+
+# When an object (user/group/company) is changed, this attribute will also change:
+# Active directory: uSNChanged
+# LDAP: modifyTimestamp
+ldap_last_modification_attribute = uSNChanged
+
+##########
+# Object settings
+
+# Top level search base, every object should be available under this tree
+ldap_search_base = dc=zarafa,dc=com
+
+# attribute name which is/(should: was) used in ldap_user_search_filter
+ldap_object_type_attribute = objectClass
+ldap_user_type_attribute_value = user
+ldap_group_type_attribute_value = group
+ldap_contact_type_attribute_value = contact
+ldap_company_type_attribute_value = organizationalUnit
+ldap_addresslist_type_attribute_value = zarafaAddresslist
+ldap_dynamicgroup_type_attribute_value = zarafaDynamicGroup
+ldap_server_type_attribute_value = computer
+
+##########
+# There should be no need to edit any values below this line
+##########
+
+##########
+# User settings
+
+# Extra search for users using this LDAP filter.  See ldap_search(3) or RFC
+# 2254 for details on the filter syntax.
+#
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+#
+# Note: This filter should include contacts.
+#
+# between non-zarafa and zarafa users.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Person)
+# For LDAP with posix users:
+#   no need to use the search filter.
+ldap_user_search_filter = (objectCategory=Person)
+
+# unique user id for find the user
+# Required
+# For active directory, use:
+#    objectGuid ** WARNING: This WAS: objectSid ** Updates *WILL* fail! **
+# For LDAP with posixAccount, use:
+#    uidNumber
+ldap_user_unique_attribute = objectGuid
+
+# Type of unique user id
+# default: text
+# For active directory, use:
+#		binary
+# For LDAP with posix user, use:
+#		text
+ldap_user_unique_attribute_type = binary
+
+# Optional, default = cn
+# For active directory, use:
+#   cn or displayName
+# For LDAP with posix user, use:
+#   cn
+ldap_fullname_attribute = cn
+
+# Optional, default = uid
+# Active directory: sAMAccountName
+# LDAP: uid
+ldap_loginname_attribute = sAMAccountName
+
+# Optional, default = userPassword
+# Active directory: unicodePwd
+# LDAP: userPassword
+ldap_password_attribute = unicodePwd
+
+# If set to bind, users are authenticated by trying to bind to the
+# LDAP tree using their username + password.  Otherwise, the
+# ldap_password_attribute is requested and checked.
+# Optional, default = bind
+# Choices: bind, password
+# Active directory: bind
+# LDAP: password
+ldap_authentication_method = bind
+
+# Optional, default = mail
+# Active directory: mail
+# LDAP: mail
+ldap_emailaddress_attribute = mail
+
+# Optional, default = zarafaAliases
+# Active directory: zarafaAliases
+# LDAP: zarafaAliases
+ldap_emailaliases_attribute = otherMailbox
+
+# Whether the user is an admin.  The field is interpreted as a
+# boolean, 0 and false (case insensitive) meaning no, all other values
+# yes.
+# Optional, default = zarafaAdmin
+# Active directory: zarafaAdmin
+# LDAP: zarafaAdmin
+ldap_isadmin_attribute = zarafaAdmin
+
+# Whether a user is a non-active user. This means that the user will
+# not count towards your user count, but the user will also not be
+# able to log in
+# Optional, default = empty
+# Active directory: zarafaSharedStoreOnly
+# LDAP: zarafaSharedStoreOnly
+ldap_nonactive_attribute = 
+
+# A nonactive store, or resource, can be specified to be a user, room or equipment.
+# Set it to 'room' or 'equipment' to make such types. If set to empty,
+# or wrong word, or 'user' it will be a nonactive user.
+# Optional, default = zarafaResourceType
+# Active directory: zarafaResourceType
+# LDAP: zarafaResourceType
+ldap_resource_type_attribute = zarafaResourceType
+
+# Numeric resource capacity
+# Optional, default = zarafaResourceCapacity
+# Active directory: zarafaResourceCapacity
+# LDAP: zarafaResourceCapacity
+ldap_resource_capacity_attribute = zarafaResourceCapacity
+
+# Optional
+# The attribute which indicates which users are allowed
+# to send on bahalf of the selected user
+ldap_user_sendas_attribute = zarafaSendAsPrivilege
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_user_sendas_attribute_type = dn
+
+# The attribute of the user which is listed in the
+# ldap_user_sendas_attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_user_sendas_relation_attribute = distinguishedName
+
+# Optional, default = userCertificate
+# Active directory: userCertificate
+# LDAP: userCertificate
+ldap_user_certificate_attribute = userCertificate
+
+# Load extra user properties from the propmap file
+!propmap /etc/zarafa/ldap.propmap.cfg
+
+##########
+# Group settings
+
+# Search for groups using this LDAP filter.  See ldap_search(3) for
+# details on the filter syntax.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa groups.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Group)
+# For LDAP with posix groups, use:
+#   no need to set the search filter
+ldap_group_search_filter = (objectCategory=Group)
+
+# unique group id for find the group
+# Required
+# For active directory, use:
+#    objectSid
+# For LDAP with posix group, use:
+#    gidNumber
+ldap_group_unique_attribute = objectSid
+
+# Type of unique group id
+# default: text
+# For active directory, use:
+#		binary
+# For LDAP with posix group, use:
+#		text
+ldap_group_unique_attribute_type = binary
+
+# Optional, default = cn
+# Active directory: cn
+# LDAP: cn
+ldap_groupname_attribute = cn
+
+# Optional, default = member
+# Active directory: member
+# LDAP: memberUid
+ldap_groupmembers_attribute = member
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_groupmembers_attribute_type = dn
+
+# The attribute of the user which is listed in ldap_groupmember_attribute
+# Active directory: empty, matching dn's
+# LDAP: uidNumber, matching users in ldap_user_unique_attribute
+ldap_groupmembers_relation_attribute = 
+
+# A group can also be used for security, eg. setting permissions on folders.
+# This makes a group a security group. The zarafaSecurityGroup value is boolean.
+# Optional, default = zarafaSecurityGroup
+# Active directory = groupType
+# LDAP: zarafaSecurityGroup
+ldap_group_security_attribute = groupType
+
+# In ADS servers, a special bitmask action is required on the groupType field.
+# This is actived by setting the ldap_group_security_attribute_type to `''ads`''
+# Otherwise, just the presence of the field will make the group security enabled.
+# Optional, default = boolean
+# Active directory = ads
+# LDAP: boolean
+ldap_group_security_attribute_type = ads
+
+##########
+# Company settings
+
+# Search for companies using this LDAP filter.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa companies.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Company)
+# For LDAP with posix users, use:
+#   no need to set the filter
+ldap_company_search_filter =
+
+# unique company id for find the company
+# Active directory: objectGUID
+# LDAP: ou
+ldap_company_unique_attribute = objectGUID
+
+# Optional, default = text
+# Active directory: binary
+# LDAP: text
+ldap_company_unique_attribute_type = binary
+
+# Optional, default = ou
+# Active directory: ou
+# LDAP: ou
+ldap_companyname_attribute = ou
+
+# Optional
+# The attribute which indicates which companies are allowed
+# to view the members of the selected company
+ldap_company_view_attribute = zarafaViewPrivilege
+
+# Optional, default = text
+ldap_company_view_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_view_attribute
+# Empty default, using ldap_company_unique_attribute
+ldap_company_view_relation_attribute =
+
+# Optional
+# The attribute which indicates which users from different companies
+# are administrator over the selected company.
+ldap_company_admin_attribute = zarafaAdminPrivilege
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_company_admin_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_admin_attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_company_admin_relation_attribute = 
+
+# The attribute which indicates which user is the system administrator
+# for the specified company.
+ldap_company_system_admin_attribute = zarafaSystemAdmin
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_company_system_admin_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_system_admin attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_company_system_admin_relation_attribute =
+
+
+##########
+# Addresslist settings
+
+# Add a filter to the addresslist search
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa addresslists.
+# Optional, default = empty (match everything)
+ldap_addresslist_search_filter = 
+
+# This is the unique attribute of a addresslist which is never going
+# to change, unless the addresslist is removed from LDAP. When this
+# value changes, Zarafa will remove the previous addresslist from the
+# database, and create a new addresslist with this unique value
+ldap_addresslist_unique_attribute = cn
+
+# This value can be 'text' or 'binary'. For OpenLDAP, only text is used.
+ldap_addresslist_unique_attribute_type = text
+
+# This is the name of the attribute on the addresslist object that
+# specifies the filter to be applied for this addresslist. All users
+# matching this filter AND matching the default
+# ldap_user_search_filter will be included in the addresslist
+ldap_addresslist_filter_attribute = zarafaFilter
+
+# This is the name of the attribute on the addresslist object that
+# specifies the search base to be applied for this addresslist.
+ldap_addresslist_search_base_attribute = zarafaBase
+
+# The attribute containing the name of the addresslist
+ldap_addresslist_name_attribute = cn
+
+
+##########
+# Dynamicgroup settings
+
+# Add a filter to the dynamicgroup search
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa dynamic groups.
+# Optional, default = empty (match everything)
+ldap_dynamicgroup_search_filter = 
+
+# This is the unique attribute of a dynamicgroup which is never going
+# to change, unless the dynamicgroup is removed from LDAP. When this
+# value changes, Zarafa will remove the previous dynamicgroup from the
+# database, and create a new dynamicgroup with this unique value
+ldap_dynamicgroup_unique_attribute = cn
+
+# This value can be 'text' or 'binary'. For OpenLDAP, only text is used.
+ldap_dynamicgroup_unique_attribute_type = text
+
+# This is the name of the attribute on the dynamicgroup object that
+# specifies the filter to be applied for this dynamicgroup. All users
+# matching this filter AND matching the default
+# ldap_user_search_filter will be included in the dynamicgroup
+ldap_dynamicgroup_filter_attribute = zarafaFilter
+
+# This is the name of the attribute on the dynamicgroup object that
+# specifies the search base to be applied for this dynamicgroup.
+ldap_dynamicgroup_search_base_attribute = zarafaBase
+
+# The attribute containing the name of the dynamicgroup
+ldap_dynamicgroup_name_attribute = cn
+
+
+##########
+# Quota settings
+
+# Optional
+# The attribute which indicates which users (besides the user who exceeds his quota)
+# should also receive a warning mail when a user exceeds his quota.
+ldap_quota_userwarning_recipients_attribute = zarafaQuotaUserWarningRecipients
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_quota_userwarning_recipients_attribute_type = text
+
+# Optional, default empty
+ldap_quota_userwarning_recipients_relation_attribute =
+
+# Optional
+# The attribute which indicates which users should receive a warning mail
+# when a company exceeds his quota.
+ldap_quota_companywarning_recipients_attribute = zarafaQuotaCompanyWarningRecipients
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_quota_companywarning_recipients_attribute_type = text
+
+# Optional, default empty
+ldap_quota_companywarning_recipients_relation_attribute =
+
+# Whether to override the system wide quota settings
+ldap_quotaoverride_attribute = zarafaQuotaOverride
+
+ldap_warnquota_attribute = zarafaQuotaWarn
+ldap_softquota_attribute = zarafaQuotaSoft
+ldap_hardquota_attribute = zarafaQuotaHard
+
+# Whether to override the system wide quota settings for all users within the company
+ldap_userdefault_quotaoverride_attribute = zarafaUserDefaultQuotaOverride
+
+ldap_userdefault_warnquota_attribute = zarafaUserDefaultQuotaWarn
+ldap_userdefault_softquota_attribute = zarafaUserDefaultQuotaSoft
+ldap_userdefault_hardquota_attribute = zarafaUserDefaultQuotaHard
+
+# Mapping from the quota attributes to a number of bytes.  Qmail-LDAP
+# schema uses bytes (1), ADS uses kilobytes (1024*1024).
+ldap_quota_multiplier = 1048576
+
+##########
+# Misc. settings
+
+# Attribute which indicates if the user should be hidden from addressbook
+ldap_addressbook_hide_attribute = zarafaHidden 
+
+# LDAP object search filter. %s in this filter will be replaced with
+# the object being searched.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa objects.
+# Default: empty
+# ADS recommended: (anr=%s)
+# OpenLDAP optional: (|(mail=%s*)(uid=%s*)(cn=*%s*)(fullname=*%s*)(givenname=*%s*)(lastname=*%s*)(sn=*%s*))
+ldap_object_search_filter = (anr=%s)
+
+##########
+# Multi-server settings
+
+# Optional, default zarafaUserServer
+ldap_user_server_attribute = zarafaUserServer
+
+# Optional, default zarafaCompanyServer
+ldap_company_server_attribute = zarafaCompanyServer
+
+# Optional, default empty
+# Active directory: ipHostNumber
+# LDAP: ipHostNumber
+ldap_server_address_attribute = ipHostNumber
+
+# Optional, default = zarafaHttpPort
+# Active directory: zarafaHttpPort
+# LDAP: zarafaHttpPort
+ldap_server_http_port_attribute = zarafaHttpPort
+
+# Optional, default = zarafaSslPort
+# Active directory: zarafaSslPort
+# LDAP: zarafaSslPort
+ldap_server_ssl_port_attribute = zarafaSslPort
+
+# Optional, default = zarafaFilePath
+# Active directory: zarafaFilePath
+#LDAP: zarafaFilePath
+ldap_server_file_path_attribute = zarafaFilePath
+
+# Determines if a server contains the public store of a non-hosted
+# environment. Only one server is allowed to host the public store.
+# Optional, default = zarafaContainsPublic
+# Active directory: zarafaContainsPublic
+# LDAP: zarafaContainsPublic
+ldap_server_contains_public_attribute = zarafaContainsPublic
+
+# Search for servers using this LDAP filter.  See ldap_search(3) or RFC
+# 2254 for details on the filter syntax.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Computer)
+# For LDAP with posix users, use:
+#   
+ldap_server_search_filter = (objectCategory=Computer)
+
+# Unique user id to find the server
+# Required
+# For active directory, use:
+#    CN
+# For LDAP with posixAccount, use:
+#    cn
+ldap_server_unique_attribute = cn
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/ldapms.openldap.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/ldapms.openldap.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/ldapms.openldap.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,502 @@
+##############################################################
+#  LDAP/ACTIVE DIRECTORY USER PLUGIN SETTINGS
+#
+# Any of these directives that are required, are only required if the
+# userplugin parameter is set to ldap.
+
+# LDAP host name/IP address
+# Optional, default = localhost
+ldap_host = localhost
+
+# LDAP port
+# Optional, default = 389
+# Use 636 for ldaps
+ldap_port = 389
+
+# LDAP protocol
+# Optional, default = ldap
+# use 'ldaps' for SSL encryption. Make sure /etc/ldap/ldap.conf is
+# configured correctly with TLS_CACERT
+ldap_protocol = ldap
+
+# The charset that strings are stored in on the LDAP server. Normally this
+# is utf-8, but this can differ according to your setup. The charset specified
+# here must be supported by your iconv(1) setup. See iconv -l for all charset
+ldap_server_charset = utf-8
+
+# The DN of the user to bind as for normal operations (not used for
+# authentication if ldap_authentication_method is set to "bind"
+# Optional, default = empty (anonymous bind)
+# The userPassword attribute must be readable for this user if the
+# ldap_authentication_method option is set to password.
+ldap_bind_user = cn=admin,cn=users,dc=zarafa,dc=com
+
+# LDAP bind password
+# Optional, default = empty (no password)
+ldap_bind_passwd = 
+
+# The timeout for network operations in seconds
+ldap_network_timeout = 30
+
+# When an object (user/group/company) is changed, this attribute will also change:
+# Active directory: uSNChanged
+# LDAP: modifyTimestamp
+ldap_last_modification_attribute = modifyTimestamp
+
+##########
+# Object settings
+
+# Top level search base, every object should be available under this tree
+ldap_search_base = dc=zarafa,dc=com
+
+# attribute name which is/(should: was) used in ldap_user_search_filter
+ldap_object_type_attribute = objectClass
+ldap_user_type_attribute_value = posixAccount
+ldap_group_type_attribute_value = posixGroup
+ldap_contact_type_attribute_value = zarafa-contact
+ldap_company_type_attribute_value = organizationalUnit
+ldap_addresslist_type_attribute_value = zarafa-addresslist
+ldap_dynamicgroup_type_attribute_value = zarafa-dynamicgroup
+ldap_server_type_attribute_value = ipHost
+
+##########
+# There should be no need to edit any values below this line
+##########
+
+##########
+# User settings
+
+# Extra search for users using this LDAP filter.  See ldap_search(3) or RFC
+# 2254 for details on the filter syntax.
+#
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+#
+# Note: This filter should include contacts.
+#
+# between non-zarafa and zarafa users.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Person)
+# For LDAP with posix users:
+#   no need to use the search filter.
+ldap_user_search_filter = 
+
+# unique user id for find the user
+# Required
+# For active directory, use:
+#    objectGuid ** WARNING: This WAS: objectSid ** Updates *WILL* fail! **
+# For LDAP with posixAccount, use:
+#    uidNumber
+ldap_user_unique_attribute = uidNumber
+
+# Type of unique user id
+# default: text
+# For active directory, use:
+#		binary
+# For LDAP with posix user, use:
+#		text
+ldap_user_unique_attribute_type = text
+
+# Optional, default = cn
+# For active directory, use:
+#   cn or displayName
+# For LDAP with posix user, use:
+#   cn
+ldap_fullname_attribute = cn
+
+# Optional, default = uid
+# Active directory: sAMAccountName
+# LDAP: uid
+ldap_loginname_attribute = uid
+
+# Optional, default = userPassword
+# Active directory: unicodePwd
+# LDAP: userPassword
+ldap_password_attribute = userPassword
+
+# If set to bind, users are authenticated by trying to bind to the
+# LDAP tree using their username + password.  Otherwise, the
+# ldap_password_attribute is requested and checked.
+# Optional, default = bind
+# Choices: bind, password
+# Active directory: bind
+# LDAP: password
+ldap_authentication_method = password
+
+# Optional, default = mail
+# Active directory: mail
+# LDAP: mail
+ldap_emailaddress_attribute = mail
+
+# Optional, default = zarafaAliases
+# Active directory: zarafaAliases
+# LDAP: zarafaAliases
+ldap_emailaliases_attribute = zarafaAliases
+
+# Whether the user is an admin.  The field is interpreted as a
+# boolean, 0 and false (case insensitive) meaning no, all other values
+# yes.
+# Optional, default = zarafaAdmin
+# Active directory: zarafaAdmin
+# LDAP: zarafaAdmin
+ldap_isadmin_attribute = zarafaAdmin
+
+# Whether a user is a non-active user. This means that the user will
+# not count towards your user count, but the user will also not be
+# able to log in
+# Optional, default = empty
+# Active directory: zarafaSharedStoreOnly
+# LDAP: zarafaSharedStoreOnly
+ldap_nonactive_attribute = 
+
+# A nonactive store, or resource, can be specified to be a user, room or equipment.
+# Set it to 'room' or 'equipment' to make such types. If set to empty,
+# or wrong word, or 'user' it will be a nonactive user.
+# Optional, default = zarafaResourceType
+# Active directory: zarafaResourceType
+# LDAP: zarafaResourceType
+ldap_resource_type_attribute = zarafaResourceType
+
+# Numeric resource capacity
+# Optional, default = zarafaResourceCapacity
+# Active directory: zarafaResourceCapacity
+# LDAP: zarafaResourceCapacity
+ldap_resource_capacity_attribute = zarafaResourceCapacity
+
+# Optional
+# The attribute which indicates which users are allowed
+# to send on bahalf of the selected user
+ldap_user_sendas_attribute = zarafaSendAsPrivilege
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_user_sendas_attribute_type = text
+
+# The attribute of the user which is listed in the
+# ldap_user_sendas_attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_user_sendas_relation_attribute = 
+
+# Optional, default = userCertificate
+# Active directory: userCertificate
+# LDAP: userCertificate
+ldap_user_certificate_attribute = userCertificate
+
+# Load extra user properties from the propmap file
+!propmap /etc/zarafa/ldap.propmap.cfg
+
+##########
+# Group settings
+
+# Search for groups using this LDAP filter.  See ldap_search(3) for
+# details on the filter syntax.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa groups.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Group)
+# For LDAP with posix groups, use:
+#   no need to set the search filter
+ldap_group_search_filter = 
+
+# unique group id for find the group
+# Required
+# For active directory, use:
+#    objectSid
+# For LDAP with posix group, use:
+#    gidNumber
+ldap_group_unique_attribute = gidNumber
+
+# Type of unique group id
+# default: text
+# For active directory, use:
+#		binary
+# For LDAP with posix group, use:
+#		text
+ldap_group_unique_attribute_type = text
+
+# Optional, default = cn
+# Active directory: cn
+# LDAP: cn
+ldap_groupname_attribute = cn
+
+# Optional, default = member
+# Active directory: member
+# LDAP: memberUid
+ldap_groupmembers_attribute = memberUid
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_groupmembers_attribute_type = text
+
+# The attribute of the user which is listed in ldap_groupmember_attribute
+# Active directory: empty, matching dn's
+# LDAP: uidNumber, matching users in ldap_user_unique_attribute
+ldap_groupmembers_relation_attribute = uidNumber
+
+# A group can also be used for security, eg. setting permissions on folders.
+# This makes a group a security group. The zarafaSecurityGroup value is boolean.
+# Optional, default = zarafaSecurityGroup
+# Active directory = groupType
+# LDAP: zarafaSecurityGroup
+ldap_group_security_attribute = zarafaSecurityGroup
+
+# In ADS servers, a special bitmask action is required on the groupType field.
+# This is actived by setting the ldap_group_security_attribute_type to `''ads`''
+# Otherwise, just the presence of the field will make the group security enabled.
+# Optional, default = boolean
+# Active directory = ads
+# LDAP: boolean
+ldap_group_security_attribute_type = boolean
+
+##########
+# Company settings
+
+# Search for companies using this LDAP filter.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa companies.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Company)
+# For LDAP with posix users, use:
+#   no need to set the filter
+ldap_company_search_filter =
+
+# unique company id for find the company
+# Active directory: objectGUID
+# LDAP: ou
+ldap_company_unique_attribute = ou
+
+# Optional, default = text
+# Active directory: binary
+# LDAP: text
+ldap_company_unique_attribute_type = text
+
+# Optional, default = ou
+# Active directory: ou
+# LDAP: ou
+ldap_companyname_attribute = ou
+
+# Optional
+# The attribute which indicates which companies are allowed
+# to view the members of the selected company
+ldap_company_view_attribute = zarafaViewPrivilege
+
+# Optional, default = text
+ldap_company_view_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_view_attribute
+# Empty default, using ldap_company_unique_attribute
+ldap_company_view_relation_attribute =
+
+# Optional
+# The attribute which indicates which users from different companies
+# are administrator over the selected company.
+ldap_company_admin_attribute = zarafaAdminPrivilege
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_company_admin_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_admin_attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_company_admin_relation_attribute = 
+
+# The attribute which indicates which user is the system administrator
+# for the specified company.
+ldap_company_system_admin_attribute = zarafaSystemAdmin
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_company_system_admin_attribute_type = text
+
+# The attribute of the company which is listed in the
+# ldap_company_system_admin attribute
+# Empty default, using ldap_user_unique_attribute
+ldap_company_system_admin_relation_attribute =
+
+
+##########
+# Addresslist settings
+
+# Add a filter to the addresslist search
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa addresslists.
+# Optional, default = empty (match everything)
+ldap_addresslist_search_filter = 
+
+# This is the unique attribute of a addresslist which is never going
+# to change, unless the addresslist is removed from LDAP. When this
+# value changes, Zarafa will remove the previous addresslist from the
+# database, and create a new addresslist with this unique value
+ldap_addresslist_unique_attribute = cn
+
+# This value can be 'text' or 'binary'. For OpenLDAP, only text is used.
+ldap_addresslist_unique_attribute_type = text
+
+# This is the name of the attribute on the addresslist object that
+# specifies the filter to be applied for this addresslist. All users
+# matching this filter AND matching the default
+# ldap_user_search_filter will be included in the addresslist
+ldap_addresslist_filter_attribute = zarafaFilter
+
+# This is the name of the attribute on the addresslist object that
+# specifies the search base to be applied for this addresslist.
+ldap_addresslist_search_base_attribute = zarafaBase
+
+# The attribute containing the name of the addresslist
+ldap_addresslist_name_attribute = cn
+
+
+##########
+# Dynamicgroup settings
+
+# Add a filter to the dynamicgroup search
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa dynamic groups.
+# Optional, default = empty (match everything)
+ldap_dynamicgroup_search_filter = 
+
+# This is the unique attribute of a dynamicgroup which is never going
+# to change, unless the dynamicgroup is removed from LDAP. When this
+# value changes, Zarafa will remove the previous dynamicgroup from the
+# database, and create a new dynamicgroup with this unique value
+ldap_dynamicgroup_unique_attribute = cn
+
+# This value can be 'text' or 'binary'. For OpenLDAP, only text is used.
+ldap_dynamicgroup_unique_attribute_type = text
+
+# This is the name of the attribute on the dynamicgroup object that
+# specifies the filter to be applied for this dynamicgroup. All users
+# matching this filter AND matching the default
+# ldap_user_search_filter will be included in the dynamicgroup
+ldap_dynamicgroup_filter_attribute = zarafaFilter
+
+# This is the name of the attribute on the dynamicgroup object that
+# specifies the search base to be applied for this dynamicgroup.
+ldap_dynamicgroup_search_base_attribute = zarafaBase
+
+# The attribute containing the name of the dynamicgroup
+ldap_dynamicgroup_name_attribute = cn
+
+
+##########
+# Quota settings
+
+# Optional
+# The attribute which indicates which users (besides the user who exceeds his quota)
+# should also receive a warning mail when a user exceeds his quota.
+ldap_quota_userwarning_recipients_attribute = zarafaQuotaUserWarningRecipients
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_quota_userwarning_recipients_attribute_type = text
+
+# Optional, default empty
+ldap_quota_userwarning_recipients_relation_attribute =
+
+# Optional
+# The attribute which indicates which users should receive a warning mail
+# when a company exceeds his quota.
+ldap_quota_companywarning_recipients_attribute = zarafaQuotaCompanyWarningRecipients
+
+# Optional, default = text
+# Active directory: dn
+# LDAP: text
+ldap_quota_companywarning_recipients_attribute_type = text
+
+# Optional, default empty
+ldap_quota_companywarning_recipients_relation_attribute =
+
+# Whether to override the system wide quota settings
+ldap_quotaoverride_attribute = zarafaQuotaOverride
+
+ldap_warnquota_attribute = zarafaQuotaWarn
+ldap_softquota_attribute = zarafaQuotaSoft
+ldap_hardquota_attribute = zarafaQuotaHard
+
+# Whether to override the system wide quota settings for all users within the company
+ldap_userdefault_quotaoverride_attribute = zarafaUserDefaultQuotaOverride
+
+ldap_userdefault_warnquota_attribute = zarafaUserDefaultQuotaWarn
+ldap_userdefault_softquota_attribute = zarafaUserDefaultQuotaSoft
+ldap_userdefault_hardquota_attribute = zarafaUserDefaultQuotaHard
+
+# Mapping from the quota attributes to a number of bytes.  Qmail-LDAP
+# schema uses bytes (1), ADS uses kilobytes (1024*1024).
+ldap_quota_multiplier = 1
+
+##########
+# Misc. settings
+
+# Attribute which indicates if the user should be hidden from addressbook
+ldap_addressbook_hide_attribute = zarafaHidden 
+
+# LDAP object search filter. %s in this filter will be replaced with
+# the object being searched.
+# Hint: Use the zarafaAccount attribute in the filter to differentiate
+# between non-zarafa and zarafa objects.
+# Default: empty
+# ADS recommended: (anr=%s)
+# OpenLDAP optional: (|(mail=%s*)(uid=%s*)(cn=*%s*)(fullname=*%s*)(givenname=*%s*)(lastname=*%s*)(sn=*%s*))
+ldap_object_search_filter = 
+
+##########
+# Multi-server settings
+
+# Optional, default zarafaUserServer
+ldap_user_server_attribute = zarafaUserServer
+
+# Optional, default zarafaCompanyServer
+ldap_company_server_attribute = zarafaCompanyServer
+
+# Optional, default empty
+# Active directory: ipHostNumber
+# LDAP: ipHostNumber
+ldap_server_address_attribute = ipHostNumber
+
+# Optional, default = zarafaHttpPort
+# Active directory: zarafaHttpPort
+# LDAP: zarafaHttpPort
+ldap_server_http_port_attribute = zarafaHttpPort
+
+# Optional, default = zarafaSslPort
+# Active directory: zarafaSslPort
+# LDAP: zarafaSslPort
+ldap_server_ssl_port_attribute = zarafaSslPort
+
+# Optional, default = zarafaFilePath
+# Active directory: zarafaFilePath
+#LDAP: zarafaFilePath
+ldap_server_file_path_attribute = zarafaFilePath
+
+# Determines if a server contains the public store of a non-hosted
+# environment. Only one server is allowed to host the public store.
+# Optional, default = zarafaContainsPublic
+# Active directory: zarafaContainsPublic
+# LDAP: zarafaContainsPublic
+ldap_server_contains_public_attribute = zarafaContainsPublic
+
+# Search for servers using this LDAP filter.  See ldap_search(3) or RFC
+# 2254 for details on the filter syntax.
+# Optional, default = empty (match everything)
+# For active directory, use:
+#   (objectCategory=Computer)
+# For LDAP with posix users, use:
+#   
+ldap_server_search_filter = 
+
+# Unique user id to find the server
+# Required
+# For active directory, use:
+#    CN
+# For LDAP with posixAccount, use:
+#    cn
+ldap_server_unique_attribute = cn
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/licensed.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/licensed.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/licensed.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,39 @@
+##############################################################
+# SERVER SETTINGS
+
+# The socket that the license server will run on
+# default: /var/run/zarafa-licensed
+server_pipe_name = /var/run/zarafad/zarafa-licensed
+
+# The URL on which we can contact zarafa-server
+server_socket = file:///var/run/zarafad/prio.sock
+
+# License path (should contain 'base' and CALs in other files)
+license_path		= /etc/zarafa/license
+
+# drop privileges and run the process as this user
+run_as_user		= zarafa
+
+# drop privileges and run the process as this group
+run_as_group		= zarafa
+
+# create a pid file for stopping the service via the init.d scripts
+pid_file		= /var/run/zarafa-licensed.pid
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+##############################################################
+# LOG SETTINGS
+
+# Logging method (syslog, eventlog, file)
+log_method		= file
+
+# Logfile (for log_method = file, '-' for stderr)
+log_file		= /var/log/zarafa/licensed.log
+
+# Loglevel (0=no logging, 5=full logging)
+log_level		= 2
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp		= 1
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/monitor.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/monitor.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/monitor.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,58 @@
+##############################################################
+# ZARAFA MONITOR SETTINGS
+
+
+# drop privileges and run the process as this user
+run_as_user = zarafa
+
+# drop privileges and run the process as this group
+run_as_group = zarafa
+
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+##############################################################
+# ZARAFA MONITOR LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method	=	file
+
+# Loglevel (0=no logging, 5=full logging)
+log_level	=	2
+
+# Logfile for log_method = file, use '-' for stderr
+log_file	=	/var/log/zarafa/monitor.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp	=	1
+
+##############################################################
+# MONITOR SSL LOGIN SETTINGS
+# 
+# Note: server_socket must be set to https://servername:portname/zarafa
+#       to use this type of login method
+
+# Login to the Zarafa server using this SSL Key
+sslkey_file = /etc/zarafa/ssl/monitor.pem
+
+# The password of the SSL Key
+sslkey_pass = replace-with-monitor-cert-password
+
+##############################################################
+# ZARAFA MONITOR MAIL QUOTA SETTINGS
+
+# Quota mail interval in days
+mailquota_resend_interval = 1
+
+# Templates to be used for quota emails which are send to the user
+# when the various user quota levels have been exceeded.
+userquota_warning_template  =   /etc/zarafa/quotamail/userwarning.mail
+userquota_soft_template     =   /etc/zarafa/quotamail/usersoft.mail
+userquota_hard_template     =   /etc/zarafa/quotamail/userhard.mail
+
+# Templates to be used for quota emails which are send to the company administrators
+# when the various company quota levels have been exceeded.
+companyquota_warning_template   =   /etc/zarafa/quotamail/companywarning.mail
+companyquota_soft_template      =   /etc/zarafa/quotamail/companysoft.mail
+companyquota_hard_template      =   /etc/zarafa/quotamail/companyhard.mail
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/search.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/search.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/search.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,115 @@
+##############################################################
+# INDEXED SEARCH SERVICE SETTINGS
+
+# Location of the index files
+index_path          = /home/system/zarafa_index/
+
+# run as specific user
+run_as_user         = zarafa
+
+# run as specific group
+run_as_group        = zarafa
+
+
+# run server in this path (when not using the -F switch)
+running_path        =   /
+
+# Limit the number of results returned (0 = don't limit)
+limit_results		=	0
+
+
+##############################################################
+# CONNECTION TO ZARAFA SERVER SETTINGS
+#
+
+
+# Login to the Zarafa server using this SSL Key
+#sslkey_file         = /etc/zarafa/ssl/search.pem
+
+# The password of the SSL Key
+#sslkey_pass         = replace-with-server-cert-password
+
+##############################################################
+# LISTEN SETTINGS
+#
+
+
+# File with RSA key for SSL, used then server_bind_name uses https
+#ssl_private_key_file= /etc/zarafa/search/privkey.pem
+
+# File with certificate for SSL, used then server_bind_name uses https
+#ssl_certificate_file= /etc/zarafa/search/cert.pem
+
+##############################################################
+# LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method          =   file
+
+# Loglevel (0=no logging, 5=full logging, 6=debugging)
+log_level           =   5
+
+# Logfile for log_method = file, use '-' for stderr
+log_file            =   /var/log/zarafa/search.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp       =   1
+
+log_buffer_size = 0 
+
+##############################################################
+# ADVANCED INDEXED SEARCH SETTINGS
+
+# Size of indexing cache (used for indexing only, not for searching)
+term_cache_size		=   64M
+
+# Ignore properties upon indexing
+# Only override this setting to expand the list
+#index_exclude_properties = 007D 0064 0C1E 0075 678E 678F
+
+##############################################################
+# INDEX OPTIMIZATION SCHEDULE
+
+# Start the optimization routine at this hour, in 24h notation.
+#optimize_start = 2
+
+# Stop the optimization routine at this hour, in 24h notation.
+# The current index that is being optimized is finished before stopping.
+#optimize_stop = 5
+
+# Only optimize indexes which wern't optimized for the past X days.
+#optimize_age = 7
+
+##############################################################
+# ATTACHMENT INDEX SETTINGS
+
+# Should attachments be indexed
+index_attachments	= no
+
+# Maximum file size for attachments
+index_attachment_max_size = 5M
+
+# Scripts to attachment to text parser
+index_attachment_parser = /etc/zarafa/searchscripts/attachments_parser
+
+# Maximum amount of memory which a parser may use in bytes (set to 0 for unlimited)
+# If this maximum is exceeded the parser will be killed
+index_attachment_parser_max_memory = 0 
+
+# Maximim amount of CPU time (in seconds) which a parser may spend on parsing (set to 0 for unlimited)
+# If this maximum is exceeded the parser will be killed
+index_attachment_parser_max_cputime = 0
+
+# Filter out parsing of attachment which has a mimetype from this list
+# Only the first part of the mime needs to be given, like 'image'.
+# This field is SPACE separated
+index_attachment_mime_filter =
+
+# Filter out parsing of attachment which has an extension from this list
+# (only tested if mimetype was not found on the attachment)
+# This field is SPACE separated
+index_attachment_extension_filter =
+
+#number of parallel indexers
+index_processes=4
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/server.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/server.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/server.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,380 @@
+##############################################################
+# SERVER SETTINGS
+
+# IP Address to bind to (0.0.0.0 for ANY)
+# Set to 127.0.0.1 if connections should only come from localhost
+# and through the webserver proxy
+server_bind		= 0.0.0.0
+
+# Accept normal TCP connections (not recommended to disable)
+server_tcp_enabled	= yes
+
+# Port to bind to
+server_tcp_port		= 236
+
+# Accept unix pipe connections (not recommended to disable)
+server_pipe_enabled	= yes
+
+
+# Name for identifying the server in a multi-server environment
+server_name = Zarafa
+
+# Database engine (mysql)
+database_engine		= mysql
+
+# Allow connections from normal users through the unix socket
+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 alias
+
+# e-mail address of the Zarafa System user
+system_email_address	= postmaster@localhost
+
+# drop privileges and run the process as this user
+run_as_user		= zarafa
+
+# drop privileges and run the process as this group
+run_as_group		= zarafa
+
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+# session timeout for clients. Values lower than 300 will be upped to 300
+# automatically. If the server hears nothing from a client in session_timeout
+# seconds, then the session is killed.
+session_timeout		= 300
+session_ip_check = yes
+
+# Socket to connect to for license server
+license_socket		= /var/run/zarafad/zarafa-licensed
+
+# Time (in seconds) to wait for a connection to the license server before
+# terminating the request.
+license_timeout = 10
+
+##############################################################
+# LOG SETTINGS
+
+# Logging method (syslog, file)
+# (DatuX: use syslog for now, because file seems to triggers a glibc locking bug in __pthread_rwlock_rdlock_slow, at least in 2.21)
+log_method		= syslog
+
+# Logfile (for log_method = file, '-' for stderr)
+log_file		= /var/log/zarafa/server.log
+
+# Loglevel (0=no logging, 5=full logging)
+log_level		= 2
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp		= 1
+
+##############################################################
+# MYSQL SETTINGS (for database_engine = mysql)
+
+# MySQL hostname to connect to for database access
+#mysql_host		= localhost
+mysql_socket		= /var/run/mysql/mysql.sock
+
+# MySQL port to connect with (usually 3306)
+mysql_port		= 3306
+
+# The user under which we connect with MySQL
+mysql_user		= zarafa
+
+# The password for the user (leave empty for no password)
+mysql_password		= %mysql_passwd%
+
+# Database to connect to
+mysql_database		= zarafa
+
+# Where to place attachments. Value can be 'database' or 'files'
+attachment_storage	= files
+
+# When attachment_storage is 'files', use this path to store the files
+attachment_path		= /home/system/zarafa
+
+# Compression level for attachments when attachment_storage is 'files'.
+# Set compression level for attachments disabled=0, max=9
+attachment_compression	= 6
+
+##############################################################
+#  SSL SETTINGS
+
+# enable SSL support in server
+server_ssl_enabled	= no
+
+# Listen for SSL connections on this port
+server_ssl_port		= 237
+
+# Required Server certificate, contains the certificate and the private key parts
+server_ssl_key_file	= /usr/webint/ssl/server.pem
+
+# Password of Server certificate
+server_ssl_key_pass	=
+
+# Required Certificate Authority of server
+server_ssl_ca_file	= /etc/zarafa/ssl/server.crt
+
+# Path with CA certificates, e.g. /etc/ssl/certs
+server_ssl_ca_path	=
+
+# Path of SSL Public keys of clients
+sslkeys_path		= /etc/zarafa/sslkeys
+
+##############################################################
+# THREAD SETTINGS
+
+# Number of server threads
+# default: 8
+threads				=	16
+
+# Watchdog frequency. The number of watchdog checks per second.
+# default: 1
+watchdog_frequency	=	1
+
+# Watchdog max age. The maximum age in ms of a task before a
+# new thread is started.
+# default: 500
+watchdog_max_age	=	500
+
+# Maximum SOAP keep_alive value
+# default: 100
+server_max_keep_alive_requests	=	100
+
+# SOAP recv timeout value
+# default: 5
+server_recv_timeout	=	5
+
+# SOAP send timeout value
+# default: 60
+server_send_timeout	=	60
+
+##############################################################
+#  OTHER SETTINGS
+
+# Softdelete clean cycle (in days) 0=never running
+# (SYN-3 uses a cronjob)
+softdelete_lifetime	= 0
+
+# Sync lifetime, removes all changes remembered for a client after x days of inactivity
+sync_lifetime		= 90
+
+# Set to 'yes' if all changes (for synchronization) to messages should be logged to the database
+sync_log_all_changes = yes
+
+
+# Set to 'yes' if you want to show the GAB to your users
+enable_gab = yes
+
+# Synchronize GAB users on every open of the GAB (otherwise, only on
+# zarafa-admin --sync)
+sync_gab_realtime = yes
+
+# Authentication can be through plugin (default, recommended), pam or kerberos
+auth_method = plugin
+
+# If auth_method is set to pam, you should provide the pam service name
+pam_service = passwd
+
+
+#############################################################
+# CACHE SETTINGS
+
+#SYN-3 caching config for around 1000 users.
+
+# around 25% of total RAM size
+cache_cell_size                 = 1G
+
+#  about 100kb per user
+cache_object_size               = 100M
+
+# about 512kb per user
+cache_indexedobject_size        = 512M
+
+cache_store_size=512M
+
+# Lifetime for userquota details
+cache_quota_lifetime		= 1
+
+# Lifetime for user details
+cache_userdetails_lifetime	= 5
+
+# Thread size in KB, default is 512
+# WARNING: Do not set too small, your server WILL crash
+thread_stacksize = 512
+
+##############################################################
+#  QUOTA SETTINGS
+
+# The default Warning Quota Level. Set to 0 to disable this level.
+# The user will receive an email when this level is reached. Value is in Mb. Default value is 0.
+quota_warn		= 0
+
+# The default Soft Quota Level. Set to 0 to disable this level.
+# The user will still receive mail, but sending new mail is prohibited, until objects are removed from the store.
+# VALUE is in Mb. Default value is 0.
+quota_soft		= 0
+
+# The default Hard Quota Level. Set to 0 to disable this level.
+# The user can not receive and send mail, until objects are removed from the store.
+# Value is in Mb. Default value is 0.
+quota_hard		= 0
+
+# The default Warning Quota Level. Set to 0 to disable this level.
+# The company administrator will receive an email when this level is reached. Value is in Mb. Default value is 0.
+companyquota_warn      = 0
+
+##############################################################
+#  USER PLUGIN SETTINGS
+
+# Name of the plugin that handles users
+# Required, default = ldap
+# Values: ldap, unix, db
+#user_plugin		= db
+user_plugin		= ldap
+
+# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
+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
+plugin_path		= /usr/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
+
+##############################################################
+# MISC SETTINGS
+
+# Enable multi-company environment
+# When set to true it is possible to create companies within the
+# zarafa instance and assign all users and groups to particular
+# companies.
+# When set to false, the normal single-company environment is created.
+enable_hosted_zarafa = false
+
+# Enable multi-server environment
+# When set to true it is possible to place users and companies on
+# specific servers.
+# When set to false, the normal single-server environment is created.
+enable_distributed_zarafa = false
+
+# Display format of store name
+# Allowed variables:
+#  %u Username
+#  %f Fullname
+#  %c Companyname
+# default: %f
+storename_format = %f
+
+# Loginname format (for Hosted installations)
+# When the user does not login through a system-wide unique
+# username (like the email address) a unique name is created
+# by combining the username and the companyname.
+# With this configuration option you can set how the
+# loginname should be built up.
+#
+# Note: Do not use the = character in the format.
+#
+# Allowed variables:
+#  %u username
+#  %c companyname
+#
+# default: %u
+loginname_format = %u
+
+# Set to yes for Windows clients to be able to download the latest
+# Zarafa Outlook client from the Zarafa server
+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
+
+# Recieve update information from the client (0 = disabled, 1 = only on error, 2 = log always)
+#client_update_log_level = 1
+# Log location for the client auto update files
+#client_update_log_path = /var/log/zarafa/autoupdate
+
+# Everyone is a special internal group, which contains every user and group
+# You may want to disable this group from the Global Addressbook by setting
+# this option to 'yes'. Administrators will still be able to see the group.
+hide_everyone = no
+
+# System is a special internal user, which has super-admin privileges
+# You may want to disable this user from the Global Addressbook by setting
+# this option to 'yes'. Administrators will still be able to see the user.
+hide_system = yes
+
+# Allow enhanced ICS operations to speedup synchronization with cached profiles.
+# default: yes
+enable_enhanced_ics = yes
+
+# AUDIT LOG SETTINGS
+# Audit logging is by default not enabled
+audit_log_enabled     = no
+# Audit logging method (syslog, file), syslog facility is 'authpriv'
+audit_log_method      = syslog
+# Audit logfile (for log_method = file, '-' for stderr)
+audit_log_file                = /var/log/zarafa/audit.log
+# Audit loglevel (0=no logging, 1=full logging)
+audit_log_level               = 1
+# Audit log timestamp - prefix each log line with timestamp in 'file' logging mode
+audit_log_timestamp   = 1
+
+# Disable features for users. Default all features are enabled. This
+# list is space separated. Currently valid values: imap
+disabled_features =
+
+
+#The server has a list of deferred writes to the tproperties table, to improve overall I/O performance. The number of deferred writes is kept below this value; setting it high will allow writes to be more efficient by grouping more writes together, but may slow down reading, and setting it low will force writes to complete directly, but speed up reading of tables.
+#max_deferred_records=
+#max_deferred_records_folder=
+
+
+
+# Enabling this option requires the zarafa-search service to
+# be running.
+search_enabled = yes
+
+# SQL Procedures allow for some optimized queries when streaming with enhanced ICS.
+# This is default disabled because you must set 'thread_stack = 256k' in your
+# MySQL server config under the [mysqld] tag and restart your MySQL server.
+enable_sql_procedures = yes
+
+
+# Time (in seconds) to wait for a connection to the zarafa-search service
+# before terminating the indexed search request.
+search_timeout = 10
+
+# Restrict the permissions that admins receive to folder permissions only. Please
+# read the server.cfg manpage before enabling this option so you really understand
+# the implications
+restrict_admin_permissions = no
+
+# The maximum level of attachment recursion; Defines the number of
+# attachment-in-attachment in-attachment levels are allowed when saving and
+# replicating objects in the database. If you really want a higher level of
+# recursion than about 20, you probably have to increase MySQL's stack_size
+# to allow replication to work properly.
+embedded_attachment_limit = 20
+
+# Header to detect whether a connection has been received through a proxy. The
+# value of the header is not inspected. If the header exists then the connection
+# is taken to be received via a proxy. An empty value disables proxy detection
+# and the value of '*' is used to indicate that all connections are proxied
+proxy_header =
+
+
+
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/spamd.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/spamd.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/spamd.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,46 @@
+##############################################################
+# SPAMD SERVICE SETTINGS
+
+# Location of the index files
+spamd_path          = /home/system/zarafa_spamd/
+
+# run as specific user
+run_as_user         = zarafa
+
+# run as specific group
+run_as_group        = zarafa
+
+
+# run server in this path (when not using the -F switch)
+running_path        =   /
+
+
+##############################################################
+# CONNECTION TO ZARAFA SERVER SETTINGS
+#
+
+# Login to the Zarafa server using this SSL Key
+#sslkey_file         = /etc/zarafa/ssl/search.pem
+
+# The password of the SSL Key
+#sslkey_pass         = replace-with-server-cert-password
+
+##############################################################
+# LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method          =   file
+
+# Loglevel (0=no logging, 5=full logging, 6=debugging)
+log_level           =   6
+
+# Logfile for log_method = file, use '-' for stderr
+log_file            =   /var/log/zarafa/spamd.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp       =   1
+
+
+##############################################################
+# SPAM FILTER SPECIFIC SETTINGS
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/spooler.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/spooler.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/spooler.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,139 @@
+##############################################################
+# SPOOLER SETTINGS
+
+# Outgoing mailserver name or IP address
+# Use 127.0.0.1 to disable virusscanning for webmail. (not recommended)
+smtp_server	=	127.0.0.3
+
+
+# drop privileges and run the process as this user
+run_as_user = zarafa
+
+# drop privileges and run the process as this group
+run_as_group = zarafa
+
+
+# run server in this path (when not using the -F switch)
+running_path = /
+
+# The us-ascii charset will be upgraded to this charset, to allow more
+# use of high-characters. Not used when always_send_utf8 is enabled.
+charset_upgrade = windows-1252
+
+# Request SMTP Delivery Status Notifications if the MTA support it
+enable_dsn = yes
+
+##############################################################
+# SPOOLER LOG SETTINGS
+
+# Logging method (syslog, file)
+log_method	=	file
+
+# Loglevel (0=no logging, 5=full logging)
+log_level	=	3
+
+# Logfile for log_method = file, use '-' for stderr
+log_file	=	/var/log/zarafa/spooler.log
+
+# Log timestamp - prefix each log line with timestamp in 'file' logging mode
+log_timestamp	=	1
+
+
+##############################################################
+# SPOOLER SSL LOGIN SETTINGS
+# 
+# Note: server_socket must be set to https://servername:portname/zarafa
+#       to use this type of login method
+
+# Login to the Zarafa server using this SSL Key
+sslkey_file = /etc/zarafa/ssl/spooler.pem
+
+# The password of the SSL Key
+sslkey_pass = replace-with-server-cert-password
+
+##############################################################
+# SPOOLER THREAD SETTINGS
+
+# Maximum number of threads used to send outgoing messages
+# Default: 5
+max_threads = 5
+
+##############################################################
+# SPOOLER FAXING SETTINGS
+
+# When sending an email that must go to a fax address, the address
+# will be rewritten to <phonenumber>@<fax_domain>
+fax_domain = fax.local
+
+# If the received number starts with a '+', it will be replaced by
+# the fax_international value.
+# eg. +3112345678@fax.local will be rewritten to 003112345678@fax.local
+fax_international = 00
+
+##############################################################
+# SPOOLER DELEGATE SETTINGS
+
+# Set this value to 'yes' to let the spooler always send emails with
+# delegates (other user than yourself in the From: header)
+# In installations before 6.20, this value was always 'yes'
+always_send_delegates = yes
+
+# This does the same as always_send_delegates, but gets rid of the 'on behalf of' text.
+#always_send_as = yes
+
+# Set this value to 'no' if you do NOT want to allow redirected e-mails
+# being sent with their original 'FROM' header
+allow_redirect_spoofing = yes
+
+# Copies the sent mail of delegates and send-as mails in the
+# "Sent Items" folder of the representer.
+copy_delegate_mails = yes
+
+# Setting this option to no will disallow sending to the everyone group.
+allow_send_to_everyone=yes
+
+##############################################################
+# SPOOLER MEETING REQUEST SETTINGS
+
+# Set this value to 'yes' to always send meeting request information
+# using TNEF method (winmail.dat attachments)
+# Otherwise, the meeting request information is sent using
+# iCalendar (calendar.ics attachment).
+always_send_tnef = no
+
+##############################################################
+# SPOOLER GROUP EXPANSION
+
+# Set this value to 'yes' if groups should be expanded to their
+# members; This means that the receiving party will see the names
+# of the group members in the To: header for example. If set to
+# 'no', the name of the group will appear in the headers.
+#
+# Note: groups with email addresses are never expanded
+expand_groups = no
+
+##############################################################
+# SPOOLER ARCHIVING SETTINGS
+
+# Enable archive_on_send to automatically archive all outgoing
+# messages.
+# This will do nothing if no archive is attached to the source mailbox.
+archive_on_send = no
+
+####################################
+# SPOOLER PLUGIN SETTINGS
+
+# Enable the spooler plugin framework
+plugin_enabled = no
+# Path to the spooler plugin manager
+plugin_manager_path = /usr/share/zarafa-spooler/python
+# Path to the activated spooler plugins.
+#   This folder contains symlinks to the zarafa plugins and custom scripts. The plugins are
+#   installed in '/usr/share/zarafa-spooler/python/plugins/'. To activate a plugin create a symbolic
+#   link in the 'plugin_path' directory.
+#
+# Example:
+#  $ ln -s /usr/share/zarafa-spooler/python/plugins/disclaimer.py /var/lib/zarafa/spooler/plugins/disclaimer.py
+plugin_path = /var/lib/zarafa/spooler/plugins
+
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/unix.cfg
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/unix.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/unix.cfg	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,42 @@
+##############################################################
+#  UNIX USER PLUGIN SETTINGS
+#
+# Any of these directives that are required, are only required if the
+# userplugin parameter is set to unix.
+
+# Charset used in /etc/passwd for the fullname of a user. Normally this
+# is us-ascii, but this can differ according to your setup.
+# The charset specified here must be supported by your iconv(1)
+# setup. See iconv -l for all charsets.
+fullname_charset = iso-8859-15
+
+# Default email domain for constructing new users
+# Required, no default
+default_domain = zarafa.com
+
+# The lowest user id that is considered a regular user
+# Optional, default = 1000
+min_user_uid = 1000
+
+# The highest user id that is considered a regular user
+# Optional, default = 10000
+max_user_uid = 10000
+
+# A list of user ids that are not considered to be regular users
+# Optional, default = empty
+# except_user_uids =
+
+# The lowest group id that is considered a regular group
+# Optional, default = 1000
+min_group_gid = 1000
+
+# The highest group id that is considered a regular group
+# Optional, default = 10000
+max_group_gid = 10000
+
+# A list of group ids that are not considered to be regular groups
+# Optional, default = empty
+# except_group_gids =
+
+# Create a user as non-active when it has this unix shell
+non_login_shell = /bin/false
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/junklearn
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/junklearn	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/junklearn	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+#WARNING: Don't trust the piped input, its from the end-user. use filtering!
+
+IFS=$' ';
+
+DSPAM_CMD="/usr/bin/dspamc";
+
+#Catch stdin en fetch signature and recipient.
+DSPAM_HEADER="`sed 's/[^a-zA-Z0-9 :_.-]//g' | grep -i -e ^X-DSPAM-Signature: -e ^X-DSPAM-Recipient: | tail -n2` " || exit 1
+DSPAM_USER="`echo \"$DSPAM_HEADER\" | grep -i ^X-DSPAM-Recipient: | cut -d ' ' -f 2`";
+DSPAM_SIGNATURE="`echo \"$DSPAM_HEADER\" | grep -i ^X-DSPAM-Signature: | cut -d ' ' -f 2`";
+
+#Catch parameters
+STATUS="$1";
+MAIL_ID="$2";
+
+
+if [[ "$DSPAM_SIGNATURE" && "$DSPAM_USER" && "$STATUS" && "$MAIL_ID" ]]; then
+	if [ "$STATUS" == "ham" ]; then
+		CLASS="innocent";
+	else
+		CLASS="spam";
+	fi
+
+	logger "$DSPAM_CMD --source=error --class=\"$CLASS\" --signature=\"$DSPAM_SIGNATURE\" --user \"$DSPAM_USER\""
+	 
+	$DSPAM_CMD --source=error --class="$CLASS" --signature="$DSPAM_SIGNATURE" --user "$DSPAM_USER";
+	exit $?;
+fi
+exit 1;
+
+
+
+
Index: npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/zarafa-spamd-retrain
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/zarafa-spamd-retrain	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/zarafa-spamd-retrain	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#SYN-3 dspam training script for zarafa-spamd. see https://github.com/psy0rz/zarafa-spamd
+
+SPAM_USER="$1"
+SPAM_ID="$2"
+CLASSIFICATION="$3"
+UNDO="$4"
+
+
+/usr/bin/dspamc --source=error --class="$CLASSIFICATION" --signature="$SPAM_ID" --user "$SPAM_USER"
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-gateway/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-gateway/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-gateway/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec pgrphack zarafa-gateway -F
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-ical/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-ical/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-ical/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec pgrphack zarafa-ical -F
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-licensed/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-licensed/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-licensed/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+GCONV_PATH=/opt/zarafa-licensed/lib LD_LIBRARY_PATH=/opt/zarafa-licensed/lib/ exec /opt/zarafa-licensed/lib/ld-linux.so.2 /opt/zarafa-licensed/bin/zarafa-licensed -F
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-monitor/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-monitor/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-monitor/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec pgrphack zarafa-monitor -F
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-search/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-search/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-search/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrphack zarafa-search -F
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-server/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-server/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-server/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+
+ulimit -n 100000
+exec pgrphack zarafa-server -F
+
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-server/start
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-server/start	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-server/start	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,16 @@
+#!/bin/bash
+TRY=10
+#nscd is essential
+svcstart /service/nscd 
+
+svc -u /service/zarafa-server
+while [ `netstat -nap | grep "LISTEN.*zarafa-server" | wc -l` -lt 2 ]; do
+    echo -n .
+    sleep 3
+    (( TRY-- ))
+    if [ $TRY -eq 0 ]; then
+                exit 1
+    fi
+done
+ 
+exit 0
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-spamd/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-spamd/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-spamd/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrphack zarafa-spamd -F
Index: npl/mailserver/zarafa_conf7/root/service/zarafa-spooler/run
===================================================================
--- npl/mailserver/zarafa_conf7/root/service/zarafa-spooler/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/service/zarafa-spooler/run	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec pgrphack /usr/bin/zarafa-spooler -F
Index: npl/mailserver/zarafa_conf7/root/usr/bin/syn3-cyrus2zarafa
===================================================================
--- npl/mailserver/zarafa_conf7/root/usr/bin/syn3-cyrus2zarafa	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/usr/bin/syn3-cyrus2zarafa	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,103 @@
+#!/bin/bash 
+
+trap "abort" 0
+abort()
+{
+	#kill special conversion imap server
+	echo "Cleaning up.."
+	pkill -f gateway-conv.cfg 2>/dev/null
+	pkill -f cyrus-conv.conf 2>/dev/null
+	sleep 3
+	pkill -9 -f gateway-conv.cfg 2>/dev/null
+	pkill -9 -f cyrus-conv.conf 2>/dev/null
+}
+
+echo "Disabling cyrus imap.."
+svcstop /service/cyrus-imapd || exit 1
+touch /service/cyrus-imapd/down
+
+#start zarafa imap gateway forever:
+echo "Starting zarafa imap.."
+rm /service/zarafa-gateway/down &>/dev/null
+svcstart /service/zarafa-gateway || exit 1
+
+
+echo "Starting 2nd zarafa imap in conversion mode.."
+#start zarafa imap gateway in special passwordless conversion mode
+#on port 10143
+zarafa-gateway -c /etc/zarafa/gateway-conv.cfg || exit 1
+
+#change cyrusconfig (that option should be commented out anyway)
+sed 's/^sasl_mech_list:.*/#&/' /etc/imapd.conf -i  
+
+#start cyrus in conversion mode
+#on port 20143
+echo "Starting 2nd cyrus imap in conversion mode.."
+/usr/cyrus/bin/master -M /etc/cyrus-conv.conf -d || exit 1
+
+sleep 5 # wait for the stuff to start up
+
+#settings
+export TZ=GMT #for imapsync
+SPECIALUSERS=" admin Administrator mailadmin nobody "
+MAXAGE=$1
+CONVDB="/root/syn3-cyrus2zarafa.$MAXAGE""days.done"
+if [ "$MAXAGE" ]; then
+	PARS="$PARS --maxage $MAXAGE"
+fi
+
+
+echo "Starting conversion..."
+migrate()
+{
+    imapsync \
+	--host1 localhost \
+	--port1 20143 \
+	--authuser1 admin \
+	--user1 "$user" \
+	--password1 `cat /etc/webint/LDAP_MASTER_PASSWD` \
+	--host2 127.0.0.1 \
+	--port2 10143 \
+	--user2 "$user" \
+	--password2 "none" \
+	--prefix2 "" \
+	--ssl2 \
+	--sep2 / \
+	--folderrec INBOX \
+	--skipsize \
+	--nofoldersizes  \
+	--useheader Message-ID \
+	--idatefromheader \
+	--nohash \
+	--regextrans2 "s/Spam/Junk E-mail/" \
+	--regextrans2 "s/Trash/Deleted Items/" \
+	--regextrans2 "s/Sent/Sent Items/" \
+	$PARS ;
+
+    return $?
+}
+
+#traverse all users
+ldapsearchpars="ldapsearch -D cn=Manager,dc=syn-3 -w `cat /etc/webint/LDAP_MASTER_PASSWD` -b ou=Users,dc=syn-3 -s one"
+for user in `$ldapsearchpars | grep ^uid: | grep -v "\\$$" | cut -f2 -d' '`; do
+	if ! echo "$SPECIALUSERS" | grep " $user " >/dev/null; then
+		if ! grep -x "$user" "$CONVDB" &>/dev/null; then
+			echo "Migrating $user pass 1:";
+			if migrate; then
+				#(second pass is needed to correct mail flags, because of some imapsync/zarafa problem)
+				echo "Migrating $user pass 2:";
+				if migrate; then
+					sync
+					echo "Migration of $user complete!"
+					echo "$user" >> $CONVDB
+					sync
+				fi
+			fi
+		else
+			echo "$user OK: already migrated";
+		fi
+	fi	
+done
+
+echo "Conversion done, days=$MAXAGE";
+echo "Run again to see if all users are OK."
Index: npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa/config.php
===================================================================
--- npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa/config.php	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa/config.php	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,176 @@
+<?php
+/* 
+	config.php
+	
+	The config file for the ajax webaccess.
+	All possible web client settings can be set in this file. Some settings 
+	(language) can also be set per user or logon.
+
+*/
+	// Comment next line to disable the config check (or set FALSE to log the config errors)
+	define("CONFIG_CHECK", TRUE);
+
+	// Default Zarafa server to connect to.
+	define("DEFAULT_SERVER","file:///var/run/zarafad/server.sock");
+	#define("DEFAULT_SERVER","file://\\\\.\\pipe\\zarafa");
+	#define("DEFAULT_SERVER","http://localhost:236/zarafa");
+
+	// When using a single-signon system on your webserver, but Zarafa is on another server
+	// you can use https to access the zarafa server, and authenticate using an SSL certificate.
+	define("SSLCERT_FILE", NULL);
+	define("SSLCERT_PASS", NULL);
+
+	// set to 'true' to strip domain from login name found from Single Signon webservers
+	define("LOGINNAME_STRIP_DOMAIN", false);
+
+	// Name of the cookie that is used for the session, we can also use an external cookie
+	if (isset($_GET["external"]) && preg_match("/[a-z][a-z0-9_]+/i",$_GET["external"])){
+		define("COOKIE_NAME",$_GET["external"]);
+	}else{
+		define("COOKIE_NAME","ZARAFA_WEBACCESS");
+	}
+	
+	// Defines the theme that should be used, is a subdirectory under the 'layout' directory.
+	define("THEME_COLOR", "default");
+	
+	// Defines the base url and end with a slash.
+	$base_url = dirname($_SERVER["PHP_SELF"]);
+	if(substr($base_url,-1)!="/") $base_url .="/";
+	define("BASE_URL", $base_url);
+	
+	// Defines the base path on the server, terminated by a slash
+	define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
+
+	// Defines the location to the MIME type definitions
+	define("MIME_TYPES", BASE_PATH . "server/mimetypes.dat");
+
+	// Defines the temp path (absolute). Here uploaded attachments will be saved.
+	// The web client doesn't work without this directory.
+	define("TMP_PATH", BASE_PATH . "tmp");
+
+	// Define the server paths
+	set_include_path(BASE_PATH. PATH_SEPARATOR . 
+	                 BASE_PATH."server/PEAR/" .  PATH_SEPARATOR . 
+	                 "/usr/share/php/");
+
+	// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
+	define("DIALOG_URL", "index.php?load=dialog&");
+
+	// Define the relative URL for Drag and drop file upload
+	define("DND_FILEUPLOAD_URL", "index.php?load=upload_attachment&");
+
+	// Define the path to the plugin directory (No slash at the end)
+	define("PATH_PLUGIN_DIR", "plugins");
+
+	// Enable the plugins
+	define("ENABLE_PLUGINS", true);
+
+	// Define list of disabled plugins separated by semicolon
+	define("DISABLED_PLUGINS_LIST", '');
+
+	// Disable PHP5>PHP4 compatibility, this could segfault apache with xml_parser_free
+	ini_set('zend.ze1_compatibility_mode', false);
+
+	// Set addressbook for GAB not to show any users unless searching for a specific user
+	define("DISABLE_FULL_GAB", false);
+
+	// Set the threshold for the addressnook to only show a full contactlist when the number of rows 
+	// do not exeed this threshold. Otherwise the user can only use the search. Enter any number above
+	// zero to set the threshold or -1 to always show the list or 0 to always hide the full list.
+	define("DISABLE_FULL_CONTACTLIST_THRESHOLD", -1);
+	
+	// Set addressbook to use an alphabetbar to only display items that start with the selected letter.
+	define('ENABLE_GAB_ALPHABETBAR', false);
+
+	// Set the number of previous days used in free busy module to show.
+	define('FREEBUSY_DAYBEFORE_COUNT', 7);
+
+	// Set the number of total days used in free busy module to show.
+	define('FREEBUSY_NUMBEROFDAYS_COUNT', 90);
+
+	// Remove delete permanently button from restore items dialog.
+	define('DISABLE_DELETE_IN_RESTORE_ITEMS', false);
+
+	// Booking method (true = direct booking, false = send meeting request)
+	define('ENABLE_DIRECT_BOOKING', true);
+
+	/**************************************\
+	* Memory usage and timeouts            *
+	\**************************************/
+	
+	// This sets the maximum time in seconds that is allowed to run before it is terminated by the parser.	
+	ini_set('max_execution_time', 300); // 5 minutes
+
+	// BLOCK_SIZE (in bytes) is used for attachments by mapi_stream_read/mapi_stream_write
+	define('BLOCK_SIZE', 1048576);
+
+	// This value is used by the webclient to prevent a session timeout (in milliseconds)
+	define('CLIENT_TIMEOUT', 5*60*1000);
+
+	// Time that static files may exist in the client's cache (13 weeks)
+	define('EXPIRES_TIME', 60*60*24*7*13);
+
+	// Time that attachments are allowed to survive (in seconds)
+	define('UPLOADED_ATTACHMENT_MAX_LIFETIME', 6*60*60);
+
+	// Define maximum nos of file can be attached at a time.
+	define('FILE_UPLOAD_LIMIT', 50);
+
+	// Define maximum nos of file can be in uploading queue at a time.
+	define('FILE_QUEUE_LIMIT', 50);
+
+	// When set to true, enable the multi-upload feature of the attachment dialog. This has the following caveats:
+	// - In FireFox, you can only upload to HTTPS when the certificate is recognized as an official (not self-signed
+	//   SSL certificate)
+	// - In Linux, some versions of flash do not support this feature and can crash during upload. Updating to the latest
+	//   version of flash should fix the issue.
+	// - In Windows, upload fails if the internet status is 'offline' - open internet explorer to reconnect
+	define("ENABLE_MULTI_UPLOAD", false);
+
+	/**************************************\
+	* FCKEditor                            *
+	\**************************************/
+	
+	// Location to the HTML editor, if installed
+	define('FCKEDITOR_PATH',dirname($_SERVER['SCRIPT_FILENAME'])."/client/widgets/fckeditor");
+	define('FCKEDITOR_JS_PATH','client/widgets/fckeditor');
+
+	// Spellchecker, change here to enable
+	define('FCKEDITOR_SPELLCHECKER_ENABLED', true);
+	define('FCKEDITOR_SPELLCHECKER_PATH', '/usr/bin/aspell');
+	define('FCKEDITOR_SPELLCHECKER_LANGUAGE', FALSE); // set FALSE to use the language chosen by the user, but make sure that these languages are installed with aspell!
+
+	/**************************************\
+	* Languages                            *
+	\**************************************/
+	
+
+	// Location to the translations
+	define("LANGUAGE_DIR", "server/language/");
+	
+	// Defines the default interface language. This can be overriden by the user.
+	// This language is also used on the login page
+	if (isset($_ENV['LANG']) && $_ENV['LANG']!="C"){
+		define('LANG', $_ENV["LANG"]); // This means the server environment language determines the web client language.
+	}else{
+		define('LANG', 'en_EN'); // default fallback language
+	}
+
+	// Defines the default time zone, change e.g. to "Europe/London" when needed
+	define('TIMEZONE', '');
+
+
+	/**************************************\
+	* Debugging                            *
+	\**************************************/
+
+	ini_set("display_errors", false);
+	error_reporting(0);
+	
+	if (file_exists("debug.php")){
+		include("debug.php");
+	}else{
+		// define empty dump function in case we still use it somewhere
+		function dump(){}
+	}
+?>
Index: npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa_webapp/config.php
===================================================================
--- npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa_webapp/config.php	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa_webapp/config.php	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,221 @@
+<?php
+/*
+	config.php
+
+	The config file for the webapp.
+	All possible web client settings can be set in this file. Some settings
+	(language) can also be set per user or logon.
+
+*/
+	// Comment next line to disable the config check (or set FALSE to log the config errors)
+	define("CONFIG_CHECK", TRUE);
+
+	// Use these options to optionally disable some PHP configuration checks.
+	// WARNING: these checks will disable checks regarding the security of the WebApp site configuration,
+	// only change them if you know the consequences - improper use will lead to an insecure installation!
+	define("CONFIG_CHECK_COOKIES_HTTP", FALSE);
+	define("CONFIG_CHECK_COOKIES_SSL", FALSE);
+
+	// The default Zarafa server socket location changed in ZCP 7.2.2 to /var/run/zarafad/server.sock.
+	// The "default:" option tries both the old and new socket locations.
+	// It is advisable to change the lines below to one define with your ZCP socket location e.g.
+	// define("DEFAULT_SERVER", "file:///var/run/zarafad/server.sock");
+	if(version_compare(phpversion('mapi'), '7.2.2', '>=')) {
+		define("DEFAULT_SERVER", "default:");
+	} else {
+		#define("DEFAULT_SERVER","http://localhost:236/zarafa");
+		define("DEFAULT_SERVER","file:///var/run/zarafa");
+	}
+
+	// When using a single-signon system on your webserver, but Zarafa is on another server
+	// you can use https to access the zarafa server, and authenticate using an SSL certificate.
+	define("SSLCERT_FILE", NULL);
+	define("SSLCERT_PASS", NULL);
+
+	// set to 'true' to strip domain from login name found from Single Signon webservers
+	define("LOGINNAME_STRIP_DOMAIN", false);
+
+	// Name of the cookie that is used for the session
+	define("COOKIE_NAME", "ZARAFA_WEBAPP");
+
+	// The timeout (in seconds) for the session. User will be logged out of WebApp
+	// when he has not actively used the WebApp for this time.
+	// Set to 0 (or remove) for no timeout during browser session.
+	define('CLIENT_TIMEOUT', 0);
+	
+	// Defines the domains from which cross domain authentication requests
+	// are allowed. E.g. if WebMeetings runs under a different domain than
+	// the WebApp then add this domain here. Add http(s):// to the domains
+	// and separate domains with spaces.
+	// Set to empty string (default) to only allow authentication requests
+	// from within the same domain.
+	// Set to "*" to allow authentication requests from any domain. (not
+	// recommended)
+	define('CROSS_DOMAIN_AUTHENTICATION_ALLOWED_DOMAINS', "");
+
+	// Defines the base url and end with a slash.
+	$base_url = dirname($_SERVER["PHP_SELF"]);
+	if(substr($base_url,-1)!="/") $base_url .="/";
+	define("BASE_URL", $base_url);
+
+	// Defines the temp path (absolute). Here uploaded attachments will be saved.
+	// The web client doesn't work without this directory.
+	define("TMP_PATH", "/home/system/zarafa_webapp");
+
+	// Define the path to the plugin directory (No slash at the end)
+	define("PATH_PLUGIN_DIR", "plugins");
+
+	// Enable the plugins
+	define("ENABLE_PLUGINS", true);
+
+	// Define list of disabled plugins separated by semicolon
+	define("DISABLED_PLUGINS_LIST", '');
+	
+	// General WebApp theme. This will be loaded by default for every user
+	// (if the theme is installed as a plugin)
+	// Users can override the 'logged-in' theme in the settings.
+	define("THEME", '');
+	
+	// The title that will be shown in the title bar of the browser
+	define("WEBAPP_TITLE", 'Zarafa WebApp (powered by SYN-3)');
+
+	// Set addressbook for GAB not to show any users unless searching for a specific user
+	define("DISABLE_FULL_GAB", false);
+
+	// Set true to hide public contact folders in address-book folder list,
+	// false will show public contact folders in address-book folder list.
+	define("DISABLE_PUBLIC_CONTACT_FOLDERS", true);
+
+	// Set the threshold for the addressnook to only show a full contactlist when the number of rows
+	// do not exeed this threshold. Otherwise the user can only use the search. Enter any number above
+	// zero to set the threshold or -1 to always show the list or 0 to always hide the full list.
+	define("DISABLE_FULL_CONTACTLIST_THRESHOLD", -1);
+
+	// Set true to show public folders in hierarchy, false will disable public folders in hierarchy.
+	define('ENABLE_PUBLIC_FOLDERS', true);
+
+	// Booking method (true = direct booking, false = send meeting request)
+	define('ENABLE_DIRECT_BOOKING', true);
+
+	// Enable GZIP compression for responses
+	define('ENABLE_RESPONSE_COMPRESSION', true);
+
+	// When set to true this disables the welcome screen to be shown for first time users.
+	define('DISABLE_WELCOME_SCREEN', false);
+
+	// When set to false it will disable showing of advanced settings.
+	define('ENABLE_ADVANCED_SETTINGS', true);
+
+	// Freebusy start offset that will be used to load freebusy data in appointments, number is subtracted from current time
+	define('FREEBUSY_LOAD_START_OFFSET', 7);
+
+	// Freebusy end offset that will be used to load freebusy data in appointments, number is added to current time
+	define('FREEBUSY_LOAD_END_OFFSET', 90);
+
+	// Maximum eml files to be included in a single ZIP archive
+	define('MAX_EML_FILES_IN_ZIP', 50);
+
+	// Additional color schemes for the calendars can be added by uncommenting and editing the following define.
+	// The format is the same as the format of COLOR_SCHEMES which is defined in default.php
+	// To change the default colors, COLOR_SCHEMES can also be defined here.
+	// Note: Every color should have a unique name, because it is used to identify the color
+	// define('ADDITIONAL_COLOR_SCHEMES', json_encode(array(
+	// 		array(
+	//			'name' => 'pink',
+	//			'displayName' => _('Pink'),
+	//			'base' => '#ff0099'
+	//		)
+	// )));
+
+	// Additional Prefix for the Contact name can be added by uncommenting and editing the following define.
+	// define('CONTACT_PREFIX', json_encode(array(
+	//  	array(_('Er.')),
+	//  	array(_('Gr.'))
+	// )));
+
+	// Additional Suffix for the Contact name can be added by uncommenting and editing the following define.
+	// define('CONTACT_SUFFIX', json_encode(array(
+	//  	array(_('A')),
+	//  	array(_('B'))
+	// )));
+
+
+	/**************************************\
+	* Memory usage and timeouts            *
+	\**************************************/
+
+	// This sets the maximum time in seconds that is allowed to run before it is terminated by the parser.
+	ini_set('max_execution_time', 300); // 5 minutes
+
+	// BLOCK_SIZE (in bytes) is used for attachments by mapi_stream_read/mapi_stream_write
+	define('BLOCK_SIZE', 1048576);
+
+	// Time that static files may exist in the client's cache (13 weeks)
+	define('EXPIRES_TIME', 60*60*24*7*13);
+
+	// Time that the state files are allowed to survive (in seconds)
+	// For filesystems on which relatime is used, this value should be larger then the relatime_interval
+	// for kernels 2.6.30 and above relatime is enabled by default, and the relatime_interval is set to
+	// 24 hours.
+	define('STATE_FILE_MAX_LIFETIME', 28*60*60);
+
+	// Time that attachments are allowed to survive (in seconds)
+	define('UPLOADED_ATTACHMENT_MAX_LIFETIME', 6*60*60);
+
+	/**************************************\
+	* Languages                            *
+	\**************************************/
+
+	// Location to the translations
+	define("LANGUAGE_DIR", "server/language/");
+
+	// Defines the default interface language. This can be overriden by the user.
+	// This language is also used on the login page
+	if (isset($_ENV['LANG']) && $_ENV['LANG']!="C"){
+		define('LANG', $_ENV["LANG"]); // This means the server environment language determines the web client language.
+	}else{
+		define('LANG', 'en_GB'); // default fallback language
+	}
+
+	// List of languages that should be enabled in the logon
+	// screen's language drop down.  Languages should be specified
+	// using <languagecode>_<regioncode>[.UTF-8], and separated with
+	// semicolon.  A list of available languages can be found in
+	// the manual or by looking at the list of directories in
+	// /usr/share/zarafa-webapp/server/language .
+	define("ENABLED_LANGUAGES", "de_DE;en_EN;en_US;fr_FR;he_IL;it_IT;nl_NL;ru_RU;zh_CN;nb_NO");
+
+	// Defines the default time zone, change e.g. to "Europe/London" when needed
+	if(function_exists("date_default_timezone_set")) {
+		if(!ini_get('date.timezone')) {
+			date_default_timezone_set('Europe/London');
+		}
+	}
+
+	/**************************************\
+	* Powerpaste                           *
+	\**************************************/
+
+	// Options for TinyMCE's powerpaste plugin, see https://www.tinymce.com/docs/enterprise/paste-from-word/#configurationoptions
+	// for more details.
+	define('POWERPASTE_WORD_IMPORT', 'merge');
+	define('POWERPASTE_HTML_IMPORT', 'merge');
+	define('POWERPASTE_ALLOW_LOCAL_IMAGES', true);
+
+	/**************************************\
+	* Debugging                            *
+	\**************************************/
+
+	ini_set("display_errors", false);
+	error_reporting(0);
+
+	if (file_exists('debug.php')){
+		include_once('debug.php');
+	}else{
+		// define empty dump function in case we still use it somewhere
+		function dump(){}
+	}
+
+
+
+?>
Index: npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa_webapp/webportal.desc
===================================================================
--- npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa_webapp/webportal.desc	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
+++ npl/mailserver/zarafa_conf7/root/var/www/htdocs/syn3/zarafa_webapp/webportal.desc	(revision c5c522c7ca74a4c1725ca5e3fe0bdcadff80e49a)
@@ -0,0 +1,1 @@
+Zarafa webapp
