1 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort.smessl 2008-12-20 01:12:53.000000000 +1100 |
2 |
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort 2008-12-20 01:13:03.000000000 +1100 |
3 |
@@ -1 +1 @@ |
4 |
-144 |
5 |
+143 |
6 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/status.smessl 2008-12-20 01:16:21.000000000 +1100 |
7 |
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/status 2008-12-20 01:14:22.000000000 +1100 |
8 |
@@ -0,0 +1 @@ |
9 |
+enabled |
10 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/type.smessl 2008-12-20 01:16:35.000000000 +1100 |
11 |
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/type 2008-12-20 01:14:22.000000000 +1100 |
12 |
@@ -0,0 +1 @@ |
13 |
+service |
14 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/access.smessl 2008-12-20 01:16:07.000000000 +1100 |
15 |
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa/access 2008-12-20 01:14:51.000000000 +1100 |
16 |
@@ -0,0 +1 @@ |
17 |
+ssl |
18 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg.smessl 2008-12-20 00:28:12.000000000 +1100 |
19 |
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg 2008-12-20 01:10:02.000000000 +1100 |
20 |
@@ -3,7 +3,7 @@ |
21 |
|
22 |
server_bind = 0.0.0.0 |
23 |
|
24 |
-server_socket = http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa |
25 |
+server_socket = http://localhost:{${'zarafa-server'}{TCPport}||'237';}/zarafa |
26 |
|
27 |
# drop privileges and run the process as this user |
28 |
run_as_user = |
29 |
@@ -19,19 +19,19 @@ |
30 |
|
31 |
# enable/disable POP3, and POP3 listen port |
32 |
pop3_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
33 |
-pop3_port = { ${'zarafa-gateway'}{pop3port} || '8110'; } |
34 |
+pop3_port = { ${'zarafa-gateway'}{pop3port} || '110'; } |
35 |
|
36 |
# enable/disable Secure POP3, and Secure POP3 listen port |
37 |
pop3s_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
38 |
-pop3s_port = { ${'zarafa-gateway'}{pop3sport} || '8995'; } |
39 |
+pop3s_port = { ${'zarafa-gateway'}{pop3sport} || '995'; } |
40 |
|
41 |
# enable/disable IMAP, and IMAP listen port |
42 |
imap_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
43 |
-imap_port = { ${'zarafa-gateway'}{imapport} || '144'; } |
44 |
+imap_port = { ${'zarafa-gateway'}{imapport} || '143'; } |
45 |
|
46 |
# enable/disable Secure IMAP, and Secure IMAP listen port |
47 |
imaps_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
48 |
-imaps_port = { ${'zarafa-gateway'}{imapsport} || '8993'; } |
49 |
+imaps_port = { ${'zarafa-gateway'}{imapsport} || '993'; } |
50 |
|
51 |
# Only mail folder for IMAP or all subfolders (calendar, contacts, tasks, etc. too) |
52 |
imap_only_mailfolders = yes |
53 |
@@ -43,10 +43,10 @@ |
54 |
imap_capability_idle = yes |
55 |
|
56 |
# File with RSA key for SSL |
57 |
-ssl_private_key_file = /etc/zarafa/gateway/privkey.pem |
58 |
+ssl_private_key_file = /home/e-smith/ssl.key/{SystemName}.{DomainName}.key |
59 |
|
60 |
#File with certificate for SSL |
61 |
-ssl_certificate_file = /etc/zarafa/gateway/cert.pem |
62 |
+ssl_certificate_file = /home/e-smith/ssl.crt/{SystemName}.{DomainName}.crt |
63 |
|
64 |
# Verify client certificate |
65 |
ssl_verify_client = no |
66 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg.smessl 2008-12-20 00:35:15.000000000 +1100 |
67 |
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-12-20 01:09:48.000000000 +1100 |
68 |
@@ -10,7 +10,7 @@ |
69 |
server_tcp_enabled = yes |
70 |
|
71 |
# Port to bind to |
72 |
-server_tcp_port = { ${'zarafa-server'}{TCPPort} || '236'; } |
73 |
+server_tcp_port = { ${'zarafa-server'}{TCPPort} || '237'; } |
74 |
|
75 |
# Accept unix pipe connections (not recommended to disable) |
76 |
server_pipe_enabled = yes |
77 |
@@ -98,22 +98,22 @@ |
78 |
server_ssl_enabled = no |
79 |
|
80 |
# Listen for SSL connections on this port |
81 |
-server_ssl_port = { ${'zarafa-server'}{SSLPort} || '237'; } |
82 |
+server_ssl_port = { ${'zarafa-server'}{TCPPort} || '237'; } |
83 |
|
84 |
# Required Server certificate, contains the certificate and the private key parts |
85 |
-server_ssl_key_file = /etc/zarafa/ssl/server.pem |
86 |
+server_ssl_key_file = /home/e-smith/ssl.pem/{SystemName}.{DomainName}.pem |
87 |
|
88 |
# Password of Server certificate |
89 |
server_ssl_key_pass = { ${'zarafa-server'}{DbPassword}; } |
90 |
|
91 |
# Required Certificate Authority of server |
92 |
-server_ssl_ca_file = /etc/zarafa/ssl/demoCA/cacert.pem |
93 |
+server_ssl_ca_file = /home/e-smith/ssl.crt/{SystemName}.{DomainName}.crt |
94 |
|
95 |
# Path with CA certificates, e.g. /etc/ssl/certs |
96 |
-server_ssl_ca_path = |
97 |
+server_ssl_ca_path = /home/e-smith/ssl.crt |
98 |
|
99 |
# Path of SSL Public keys of clients |
100 |
-sslkeys_path = /etc/zarafa/sslkeys |
101 |
+sslkeys_path = /home/e-smith/ssl.pem |
102 |
|
103 |
|
104 |
############################################################## |
105 |
@@ -179,7 +179,12 @@ |
106 |
user_plugin = { ${'zarafa-server'}{Plugin} || 'db'; } |
107 |
|
108 |
# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config |
109 |
-user_plugin_config = /etc/zarafa/unix.cfg |
110 |
+{ |
111 |
+ if (${'zarafa-server'}{Plugin} || 'db' eq 'unix') |
112 |
+ { user_plugin_config = /etc/zarafa/unix.cfg } |
113 |
+ else |
114 |
+ { user_plugin_config = /etc/zarafa/ldap.cfg } |
115 |
+} |
116 |
|
117 |
# location of the zarafa plugins |
118 |
# if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa |