diff -urN smeserver-zarafa-0.9.0.orig/createlinks smeserver-zarafa-0.9.0/createlinks --- smeserver-zarafa-0.9.0.orig/createlinks 2009-06-11 23:22:21.000000000 +1000 +++ smeserver-zarafa-0.9.0/createlinks 2009-06-11 23:47:28.000000000 +1000 @@ -38,13 +38,9 @@ foreach $event (qw( post-upgrade email-update )) { - templates2events("/etc/zarafa/dagent.cfg", "$event"); templates2events("/etc/zarafa/gateway.cfg", "$event"); templates2events("/etc/zarafa/ical.cfg", "$event"); - templates2events("/etc/zarafa/licensed", "$event"); - templates2events("/etc/zarafa/monitor.cfg", "$event"); templates2events("/etc/zarafa/server.cfg", "$event"); - templates2events("/etc/zarafa/spooler.cfg", "$event"); templates2events("/etc/zarafa/unix.cfg", "$event"); templates2events("/etc/zarafa/ldap.cfg", "$event"); } diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/events/actions/zarafa-expand-templates smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-expand-templates --- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/events/actions/zarafa-expand-templates 2009-06-11 23:22:20.000000000 +1000 +++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-expand-templates 2009-06-11 23:46:21.000000000 +1000 @@ -1,11 +1,7 @@ #!/bin/sh -/sbin/e-smith/expand-template /etc/zarafa/dagent.cfg /sbin/e-smith/expand-template /etc/zarafa/gateway.cfg /sbin/e-smith/expand-template /etc/zarafa/ical.cfg -/sbin/e-smith/expand-template /etc/zarafa/licensed.cfg -/sbin/e-smith/expand-template /etc/zarafa/monitor.cfg /sbin/e-smith/expand-template /etc/zarafa/server.cfg -/sbin/e-smith/expand-template /etc/zarafa/spooler.cfg /sbin/e-smith/expand-template /etc/zarafa/unix.cfg /sbin/e-smith/expand-template /etc/zarafa/ldap.cfg diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg --- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg 2009-06-11 23:22:21.000000000 +1000 +++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg 1970-01-01 10:00:00.000000000 +1000 @@ -1,16 +0,0 @@ -############################################################## -# DAGENT SETTINGS - -server_socket = file:///var/run/zarafa - -############################################################## -# 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 diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/licensed.cfg/licensed.cfg smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/licensed.cfg/licensed.cfg --- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/licensed.cfg/licensed.cfg 2009-06-11 23:22:21.000000000 +1000 +++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/licensed.cfg/licensed.cfg 1970-01-01 10:00:00.000000000 +1000 @@ -1,40 +0,0 @@ -############################################################## -# SERVER SETTINGS - -# The socket that the license server will run on -# default: /var/run/zarafa-licensed -server_pipe_name = /var/run/zarafa-licensed - -# The URL on which we can contact zarafa-server -# default: file:///var/run/zarafa -server_socket = file:///var/run/zarafa - -# 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 = - -# drop privileges and run the process as this group -run_as_group = - -# 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 diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/monitor.cfg/monitor.cfg smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/monitor.cfg/monitor.cfg --- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/monitor.cfg/monitor.cfg 2009-06-11 23:22:21.000000000 +1000 +++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/monitor.cfg/monitor.cfg 1970-01-01 10:00:00.000000000 +1000 @@ -1,62 +0,0 @@ -############################################################## -# ZARAFA MONITOR SETTINGS - -# Server unix socket location -server_socket = file:///var/run/zarafa - -# drop privileges and run the process as this user -run_as_user = - -# drop privileges and run the process as this group -run_as_group = - -# create a pid file for stopping the service via the init.d scripts -pid_file = /var/run/zarafa-monitor.pid - -# 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 diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/spooler.cfg/spooler.cfg smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/spooler.cfg/spooler.cfg --- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/spooler.cfg/spooler.cfg 2009-06-11 23:22:21.000000000 +1000 +++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/spooler.cfg/spooler.cfg 1970-01-01 10:00:00.000000000 +1000 @@ -1,75 +0,0 @@ -############################################################## -# SPOOLER SETTINGS - -# Outgoing mailserver name or IP address -smtp_server = localhost - -# Server unix socket location -server_socket = file:///var/run/zarafa - -# drop privileges and run the process as this user -run_as_user = - -# drop privileges and run the process as this group -run_as_group = - -# create a pid file for stopping the service via the init.d scripts -pid_file = /var/run/zarafa-spooler.pid - -# run server in this path (when not using the -F switch) -running_path = / - -############################################################## -# 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 @ -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 = no