diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/migrate/80zarafa mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/migrate/80zarafa
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/migrate/80zarafa 2008-12-26 17:20:54.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/migrate/80zarafa 2008-12-26 17:16:08.000000000 -0600
@@ -1,13 +1,4 @@
{
- $DB->set_prop('pop3', 'TCPPort', '8110');
- $DB->set_prop('pop3s', 'TCPPort', '8995');
- $DB->set_prop('imap', 'TCPPort', '8143');
- $DB->set_prop('imaps', 'TCPPort', '8993');
- $DB->set_prop('pop3', 'status', 'disabled');
- $DB->set_prop('pop3s', 'status', 'disabled');
- $DB->set_prop('imap', 'status', 'disabled');
- $DB->set_prop('imaps', 'status', 'disabled');
-
use MIME::Base64 qw(encode_base64);
my $rec = $DB->get('zarafa-server') || $DB->new_record('zarafa-server', {type => 'service'});
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2008-12-26 17:20:54.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2008-12-26 17:18:37.000000000 -0600
@@ -5,6 +5,17 @@
{
$OUT .= qq(
# Zarafa specific configuration files.
+
+ Alias /zarafa /var/www/html/webaccess/
+
+ Options -Indexes
+ AllowOverride None
+ order allow,deny
+ allow from all
+ AddType application/x-httpd-php .php
+ php_flag magic_quotes_gpc off
+ php_flag track_vars on
+
Options -Indexes
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases 2008-12-26 17:20:54.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases 2008-12-26 17:18:15.000000000 -0600
@@ -15,7 +15,7 @@
return " # Zarafa is disabled in this VirtualHost\n"
unless $zwebmailStatus eq 'enabled';
- foreach $place ('zarafa','webaccess','webmail','mobile','Microsoft-Server-ActiveSync')
+ foreach $place ('zarafa','webaccess','mobile','Microsoft-Server-ActiveSync')
{
if (($port eq "80") && ($haveSSL eq 'yes') && ($zwebmailAccessType eq 'SSL'))
{
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa 2008-12-26 17:20:54.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa 2008-12-26 17:18:53.000000000 -0600
@@ -1,5 +1,5 @@
{
- my $zarafa = $user->prop('zarafa') || 'enabled';
+ my $zarafa = $user->prop('zarafa') || 'disabled';
return "| /usr/bin/zarafa-dagent -q $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
if ($zarafa eq 'enabled');
}
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/access mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/access
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/access 2008-10-02 10:56:39.000000000 -0500
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/access 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-public
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort 2008-12-31 15:32:25.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-995,993
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/access mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/access
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/access 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/access 2008-12-30 11:23:55.000000000 -0600
@@ -0,0 +1 @@
+private
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/status mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/status
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/status 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/status 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/TCPPort 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/TCPPort 2008-12-30 11:25:41.000000000 -0600
@@ -0,0 +1 @@
+8143
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/type mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/type
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/type 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/type 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+service
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/access mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/access
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/access 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/access 2008-12-30 11:26:16.000000000 -0600
@@ -0,0 +1 @@
+public
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/status mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/status
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/status 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/status 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/TCPPort 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/TCPPort 2008-12-30 11:33:31.000000000 -0600
@@ -0,0 +1 @@
+8993
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/type mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/type
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/type 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/type 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+service
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/access mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/access
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/access 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/access 2008-12-30 11:23:55.000000000 -0600
@@ -0,0 +1 @@
+private
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/status mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/status
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/status 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/status 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/TCPPort 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/TCPPort 2008-12-30 11:34:30.000000000 -0600
@@ -0,0 +1 @@
+8110
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/type mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/type
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/type 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/type 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+service
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/access mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/access
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/access 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/access 2008-12-30 11:35:10.000000000 -0600
@@ -0,0 +1 @@
+public
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/status mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/status
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/status 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/status 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/TCPPort 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/TCPPort 2008-12-30 11:34:55.000000000 -0600
@@ -0,0 +1 @@
+8995
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/type mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/type
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/type 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/type 2008-12-30 11:23:14.000000000 -0600
@@ -0,0 +1 @@
+service
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-server/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-server/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-server/TCPPort 2008-12-31 15:32:24.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-server/TCPPort 2008-12-30 16:50:25.000000000 -0600
@@ -1 +1 @@
-237
+236
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/access mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/access
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/access 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/access 2008-10-02 10:56:56.000000000 -0500
@@ -0,0 +1 @@
+public
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/status mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/status
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/status 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/status 2008-10-02 10:56:56.000000000 -0500
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/TCPPort mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/TCPPort
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/TCPPort 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/TCPPort 2008-12-30 16:51:49.000000000 -0600
@@ -0,0 +1 @@
+237
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/type mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/type
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/type 1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/type 2008-10-02 10:56:56.000000000 -0500
@@ -0,0 +1 @@
+service
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2008-12-31 15:32:25.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2008-12-30 16:35:36.000000000 -0600
@@ -3,40 +3,24 @@
/bin/echo "initialize-default-databases"
/etc/e-smith/events/actions/initialize-default-databases
-/bin/echo "set users to use zarafa"
-/etc/e-smith/events/actions/qmail-update-user
-
-/bin/echo "reassign and disable sme gateway ports"
-/sbin/e-smith/config setprop pop3 TCPPort 8110
-/sbin/e-smith/config setprop pop3s TCPPort 8995
-/sbin/e-smith/config setprop imap TCPPort 8143
-/sbin/e-smith/config setprop imaps TCPPort 8993
-/sbin/e-smith/config setprop pop3 status disabled
-/sbin/e-smith/config setprop pop3s status disabled
-/sbin/e-smith/config setprop imap status disabled
-/sbin/e-smith/config setprop imaps status disabled
-/usr/bin/sv d /service/pop3
-/usr/bin/sv d /service/pop3s
-/usr/bin/sv d /service/imap
-/usr/bin/sv d /service/imaps
-/sbin/e-smith/expand-template /etc/rc.d/init.d/masq
-/etc/init.d/masq restart
-
-#is this needed, it stalls during install ?
-#/bin/echo "signal-events"
-#/sbin/e-smith/signal-event remoteaccess-update
+/bin/echo "signal-event remoteaccess-update"
+/sbin/e-smith/signal-event remoteaccess-update
/bin/echo "webaccess config"
/bin/chown -R www:www /var/www/html/webaccess/tmp
/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
/usr/bin/sv restart /service/httpd-e-smith
-/bin/echo "expanding zarafa templates"
-/etc/e-smith/events/actions/zarafa-expand-templates
-
/bin/echo "creating zarafa database"
/etc/e-smith/events/actions/zarafa-create-database
+/bin/echo "Enter your user plugin. Values: unix, db, ldap"
+read USERPLUGIN
+/sbin/e-smith/config setprop zarafa-server Plugin $USERPLUGIN
+
+/bin/echo "expanding zarafa templates"
+/etc/e-smith/events/actions/zarafa-expand-templates
+
/bin/echo "starting services"
/etc/e-smith/events/actions/zarafa-services start
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg mezzanine_patched_smeserver-zarafa-0.9.0/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 2008-09-17 19:43:22.000000000 -0500
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg 2008-12-24 11:51:30.000000000 -0600
@@ -1,7 +1,7 @@
##############################################################
# DAGENT SETTINGS
-server_socket = https://localhost:237/zarafa
+server_socket = file:///var/run/zarafa
##############################################################
# DAGENT SSL LOGIN SETTINGS
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg 2008-12-31 15:32:25.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg 2008-12-30 16:48:59.000000000 -0600
@@ -3,7 +3,7 @@
server_bind = 0.0.0.0
-server_socket = http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa
+server_socket = http://localhost:{${'zarafa-server'}{TCPPort}||'236';}/zarafa
# drop privileges and run the process as this user
run_as_user =
@@ -18,20 +18,20 @@
running_path = /
# enable/disable POP3, and POP3 listen port
-pop3_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-pop3_port = { ${'zarafa-gateway'}{pop3port} || '110'; }
+pop3_enable = { if (${'zarafa-pop3'}{status} eq 'enabled') {'yes'} else {'no'}; }
+pop3_port = { ${'zarafa-pop3'}{TCPPort} || '8110'; }
# enable/disable Secure POP3, and Secure POP3 listen port
-pop3s_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-pop3s_port = { ${'zarafa-gateway'}{pop3sport} || '995'; }
+pop3s_enable = { if (${'zarafa-pop3s'}{status} eq 'enabled') {'yes'} else {'no'}; }
+pop3s_port = { ${'zarafa-pop3s'}{TCPPort} || '8995'; }
# enable/disable IMAP, and IMAP listen port
-imap_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-imap_port = { ${'zarafa-gateway'}{imapport} || '143'; }
+imap_enable = { if (${'zarafa-imap'}{status} eq 'enabled') {'yes'} else {'no'}; }
+imap_port = { ${'zarafa-imap'}{TCPPort} || '8143'; }
# enable/disable Secure IMAP, and Secure IMAP listen port
-imaps_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; }
-imaps_port = { ${'zarafa-gateway'}{imapsport} || '993'; }
+imaps_enable = { if (${'zarafa-imaps'}{status} eq 'enabled') {'yes'} else {'no'}; }
+imaps_port = { ${'zarafa-imaps'}{TCPPort} || '8993'; }
# Only mail folder for IMAP or all subfolders (calendar, contacts, tasks, etc. too)
imap_only_mailfolders = yes
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-12-31 15:32:25.000000000 -0600
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-12-31 14:15:50.000000000 -0600
@@ -10,7 +10,7 @@
server_tcp_enabled = yes
# Port to bind to
-server_tcp_port = { ${'zarafa-server'}{tcpport} || '236'; }
+server_tcp_port = { ${'zarafa-server'}{TCPPort} || '236'; }
# Accept unix pipe connections (not recommended to disable)
server_pipe_enabled = yes
@@ -98,7 +98,7 @@
server_ssl_enabled = no
# Listen for SSL connections on this port
-server_ssl_port = { ${'zarafa-server'}{TCPPort} || '237'; }
+server_ssl_port = { ${'zarafa-ssl'}{TCPPort} || '237'; }
# Required Server certificate, contains the certificate and the private key parts
server_ssl_key_file = /home/e-smith/ssl.pem/{$SystemName}.{$DomainName}.pem