1 |
dungog |
1.1 |
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install.smessl2 2008-12-20 02:04:52.000000000 +1100 |
2 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2008-12-20 02:49:37.000000000 +1100 |
3 |
|
|
@@ -3,11 +3,26 @@ |
4 |
|
|
/bin/echo "initialize-default-databases" |
5 |
|
|
/etc/e-smith/events/actions/initialize-default-databases |
6 |
|
|
|
7 |
|
|
-/bin/echo "remoteaccess-update" |
8 |
|
|
+/bin/echo "reassign and disable sme gateway ports" |
9 |
|
|
+/sbin/e-smith/config setprop pop3 TCPPort 8110 |
10 |
|
|
+/sbin/e-smith/config setprop pop3s TCPPort 8995 |
11 |
|
|
+/sbin/e-smith/config setprop imap TCPPort 8143 |
12 |
|
|
+/sbin/e-smith/config setprop imaps TCPPort 8993 |
13 |
|
|
+/sbin/e-smith/config setprop pop3 status disabled |
14 |
|
|
+/sbin/e-smith/config setprop pop3s status disabled |
15 |
|
|
+/sbin/e-smith/config setprop imap status disabled |
16 |
|
|
+/sbin/e-smith/config setprop imaps status disabled |
17 |
|
|
+ |
18 |
|
|
+/bin/echo "signal-events" |
19 |
|
|
+#/sbin/e-smith/signal-event email-update |
20 |
|
|
/sbin/e-smith/signal-event remoteaccess-update |
21 |
|
|
|
22 |
|
|
-/bin/echo "creating zarafa database" |
23 |
|
|
-/etc/e-smith/events/actions/zarafa-create-database |
24 |
|
|
+# why doesn't email-update restart these on new ports ? |
25 |
|
|
+# need bigger event ? for now shut down |
26 |
|
|
+/usr/bin/sv d /service/pop3 |
27 |
|
|
+/usr/bin/sv d /service/pop3s |
28 |
|
|
+/usr/bin/sv d /service/imap |
29 |
|
|
+/usr/bin/sv d /service/imaps |
30 |
|
|
|
31 |
|
|
/bin/echo "webaccess config" |
32 |
|
|
/bin/chown -R www:www /var/www/html/webaccess/tmp |
33 |
|
|
@@ -17,6 +32,9 @@ |
34 |
|
|
/bin/echo "expanding zarafa templates" |
35 |
|
|
/etc/e-smith/events/actions/zarafa-expand-templates |
36 |
|
|
|
37 |
|
|
+/bin/echo "creating zarafa database" |
38 |
|
|
+/etc/e-smith/events/actions/zarafa-create-database |
39 |
|
|
+ |
40 |
|
|
/bin/echo "starting services" |
41 |
|
|
/etc/e-smith/events/actions/zarafa-services start |
42 |
|
|
|
43 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg.smessl2 2008-12-20 01:57:35.000000000 +1100 |
44 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg 2008-12-20 01:58:09.000000000 +1100 |
45 |
|
|
@@ -43,10 +43,10 @@ |
46 |
|
|
imap_capability_idle = yes |
47 |
|
|
|
48 |
|
|
# File with RSA key for SSL |
49 |
|
|
-ssl_private_key_file = /home/e-smith/ssl.key/{SystemName}.{DomainName}.key |
50 |
|
|
+ssl_private_key_file = /home/e-smith/ssl.key/{$SystemName}.{$DomainName}.key |
51 |
|
|
|
52 |
|
|
#File with certificate for SSL |
53 |
|
|
-ssl_certificate_file = /home/e-smith/ssl.crt/{SystemName}.{DomainName}.crt |
54 |
|
|
+ssl_certificate_file = /home/e-smith/ssl.crt/{$SystemName}.{$DomainName}.crt |
55 |
|
|
|
56 |
|
|
# Verify client certificate |
57 |
|
|
ssl_verify_client = no |
58 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg.smessl2 2008-12-20 02:54:16.000000000 +1100 |
59 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg 2008-12-20 03:09:22.000000000 +1100 |
60 |
|
|
@@ -20,17 +20,16 @@ |
61 |
|
|
ical_enable = { if (${'zarafa-ical'}{status} eq 'enabled') {'yes'} else {'no'}; } |
62 |
|
|
|
63 |
|
|
# port which the ical server listens on for normal connections |
64 |
|
|
-ical_port = 8080 |
65 |
|
|
-ical_port = { ${'zarafa-ical'}{icalport} || '8008'; } |
66 |
|
|
+ical_port = { ${'zarafa-ical'}{icalport} || '8088'; } |
67 |
|
|
|
68 |
|
|
# wether ssl connections can be made to the ical server |
69 |
|
|
icals_enable = { if (${'zarafa-ical'}{status} eq 'enabled') {'yes'} else {'no'}; } |
70 |
|
|
|
71 |
|
|
# port which the ical server listens on for ssl connections |
72 |
|
|
-icals_port = { ${'zarafa-ical'}{icalsport} || '8443'; } |
73 |
|
|
+icals_port = { ${'zarafa-ical'}{icalsport} || '8089'; } |
74 |
|
|
|
75 |
|
|
# default connection to the Zarafa server |
76 |
|
|
-server_socket = http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa |
77 |
|
|
+server_socket = http://localhost:{${'zarafa-server'}{tcpport}||'237';}/zarafa |
78 |
|
|
|
79 |
|
|
############################################################## |
80 |
|
|
# ICAL LOG SETTINGS |
81 |
|
|
@@ -51,10 +50,10 @@ |
82 |
|
|
# ICAL SSL SETTINGS FOR INCOMING CONNECTIONS |
83 |
|
|
|
84 |
|
|
# File with RSA key for SSL |
85 |
|
|
-ssl_private_key_file = /etc/zarafa/ical/privkey.pem |
86 |
|
|
+ssl_private_key_file = /home/e-smith/ssl.key/{$SystemName}.{$DomainName}.key |
87 |
|
|
|
88 |
|
|
-# File with certificate for SSL |
89 |
|
|
-ssl_certificate_file = /etc/zarafa/ical/cert.pem |
90 |
|
|
+#File with certificate for SSL |
91 |
|
|
+ssl_certificate_file = /home/e-smith/ssl.crt/{$SystemName}.{$DomainName}.crt |
92 |
|
|
|
93 |
|
|
# Verify client certificate |
94 |
|
|
ssl_verify_client = no |
95 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg.smessl2 2008-12-20 01:56:34.000000000 +1100 |
96 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-12-20 02:02:41.000000000 +1100 |
97 |
|
|
@@ -101,13 +101,13 @@ |
98 |
|
|
server_ssl_port = { ${'zarafa-server'}{TCPPort} || '237'; } |
99 |
|
|
|
100 |
|
|
# Required Server certificate, contains the certificate and the private key parts |
101 |
|
|
-server_ssl_key_file = /home/e-smith/ssl.pem/{SystemName}.{DomainName}.pem |
102 |
|
|
+server_ssl_key_file = /home/e-smith/ssl.pem/{$SystemName}.{$DomainName}.pem |
103 |
|
|
|
104 |
|
|
# Password of Server certificate |
105 |
|
|
server_ssl_key_pass = { ${'zarafa-server'}{DbPassword}; } |
106 |
|
|
|
107 |
|
|
# Required Certificate Authority of server |
108 |
|
|
-server_ssl_ca_file = /home/e-smith/ssl.crt/{SystemName}.{DomainName}.crt |
109 |
|
|
+server_ssl_ca_file = /home/e-smith/ssl.crt/{$SystemName}.{$DomainName}.crt |
110 |
|
|
|
111 |
|
|
# Path with CA certificates, e.g. /etc/ssl/certs |
112 |
|
|
server_ssl_ca_path = /home/e-smith/ssl.crt |
113 |
|
|
@@ -180,10 +180,10 @@ |
114 |
|
|
|
115 |
|
|
# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config |
116 |
|
|
{ |
117 |
|
|
- if (${'zarafa-server'}{Plugin} || 'db' eq 'unix') |
118 |
|
|
- { user_plugin_config = /etc/zarafa/unix.cfg } |
119 |
|
|
+ if (( ${'zarafa-server'}{Plugin} || 'db' ) eq 'unix') |
120 |
|
|
+ { 'user_plugin_config = /etc/zarafa/unix.cfg'; } |
121 |
|
|
else |
122 |
|
|
- { user_plugin_config = /etc/zarafa/ldap.cfg } |
123 |
|
|
+ { 'user_plugin_config = /etc/zarafa/ldap.cfg'; } |
124 |
|
|
} |
125 |
|
|
|
126 |
|
|
# location of the zarafa plugins |