1 |
dungog |
1.1 |
diff -urN smeserver-zarafa-0.9.0.orig/createlinks smeserver-zarafa-0.9.0/createlinks |
2 |
|
|
--- smeserver-zarafa-0.9.0.orig/createlinks 2009-06-11 23:22:21.000000000 +1000 |
3 |
|
|
+++ smeserver-zarafa-0.9.0/createlinks 2009-06-11 23:47:28.000000000 +1000 |
4 |
|
|
@@ -38,13 +38,9 @@ |
5 |
|
|
|
6 |
|
|
foreach $event (qw( post-upgrade email-update )) |
7 |
|
|
{ |
8 |
|
|
- templates2events("/etc/zarafa/dagent.cfg", "$event"); |
9 |
|
|
templates2events("/etc/zarafa/gateway.cfg", "$event"); |
10 |
|
|
templates2events("/etc/zarafa/ical.cfg", "$event"); |
11 |
|
|
- templates2events("/etc/zarafa/licensed", "$event"); |
12 |
|
|
- templates2events("/etc/zarafa/monitor.cfg", "$event"); |
13 |
|
|
templates2events("/etc/zarafa/server.cfg", "$event"); |
14 |
|
|
- templates2events("/etc/zarafa/spooler.cfg", "$event"); |
15 |
|
|
templates2events("/etc/zarafa/unix.cfg", "$event"); |
16 |
|
|
templates2events("/etc/zarafa/ldap.cfg", "$event"); |
17 |
|
|
} |
18 |
|
|
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 |
19 |
|
|
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/events/actions/zarafa-expand-templates 2009-06-11 23:22:20.000000000 +1000 |
20 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-expand-templates 2009-06-11 23:46:21.000000000 +1000 |
21 |
|
|
@@ -1,11 +1,7 @@ |
22 |
|
|
#!/bin/sh |
23 |
|
|
|
24 |
|
|
-/sbin/e-smith/expand-template /etc/zarafa/dagent.cfg |
25 |
|
|
/sbin/e-smith/expand-template /etc/zarafa/gateway.cfg |
26 |
|
|
/sbin/e-smith/expand-template /etc/zarafa/ical.cfg |
27 |
|
|
-/sbin/e-smith/expand-template /etc/zarafa/licensed.cfg |
28 |
|
|
-/sbin/e-smith/expand-template /etc/zarafa/monitor.cfg |
29 |
|
|
/sbin/e-smith/expand-template /etc/zarafa/server.cfg |
30 |
|
|
-/sbin/e-smith/expand-template /etc/zarafa/spooler.cfg |
31 |
|
|
/sbin/e-smith/expand-template /etc/zarafa/unix.cfg |
32 |
|
|
/sbin/e-smith/expand-template /etc/zarafa/ldap.cfg |
33 |
|
|
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 |
34 |
|
|
--- 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 |
35 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg 1970-01-01 10:00:00.000000000 +1000 |
36 |
|
|
@@ -1,16 +0,0 @@ |
37 |
|
|
-############################################################## |
38 |
|
|
-# DAGENT SETTINGS |
39 |
|
|
- |
40 |
|
|
-server_socket = file:///var/run/zarafa |
41 |
|
|
- |
42 |
|
|
-############################################################## |
43 |
|
|
-# DAGENT SSL LOGIN SETTINGS |
44 |
|
|
-# |
45 |
|
|
-# Note: server_socket must be set to https://servername:portname/zarafa |
46 |
|
|
-# to use this type of login method |
47 |
|
|
- |
48 |
|
|
-# Login to the Zarafa server using this SSL Key |
49 |
|
|
-sslkey_file = /etc/zarafa/ssl/dagent.pem |
50 |
|
|
- |
51 |
|
|
-# The password of the SSL Key |
52 |
|
|
-sslkey_pass = replace-with-dagent-cert-password |
53 |
|
|
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 |
54 |
|
|
--- 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 |
55 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/licensed.cfg/licensed.cfg 1970-01-01 10:00:00.000000000 +1000 |
56 |
|
|
@@ -1,40 +0,0 @@ |
57 |
|
|
-############################################################## |
58 |
|
|
-# SERVER SETTINGS |
59 |
|
|
- |
60 |
|
|
-# The socket that the license server will run on |
61 |
|
|
-# default: /var/run/zarafa-licensed |
62 |
|
|
-server_pipe_name = /var/run/zarafa-licensed |
63 |
|
|
- |
64 |
|
|
-# The URL on which we can contact zarafa-server |
65 |
|
|
-# default: file:///var/run/zarafa |
66 |
|
|
-server_socket = file:///var/run/zarafa |
67 |
|
|
- |
68 |
|
|
-# License path (should contain 'base' and CALs in other files) |
69 |
|
|
-license_path = /etc/zarafa/license |
70 |
|
|
- |
71 |
|
|
-# drop privileges and run the process as this user |
72 |
|
|
-run_as_user = |
73 |
|
|
- |
74 |
|
|
-# drop privileges and run the process as this group |
75 |
|
|
-run_as_group = |
76 |
|
|
- |
77 |
|
|
-# create a pid file for stopping the service via the init.d scripts |
78 |
|
|
-pid_file = /var/run/zarafa-licensed.pid |
79 |
|
|
- |
80 |
|
|
-# run server in this path (when not using the -F switch) |
81 |
|
|
-running_path = / |
82 |
|
|
- |
83 |
|
|
-############################################################## |
84 |
|
|
-# LOG SETTINGS |
85 |
|
|
- |
86 |
|
|
-# Logging method (syslog, eventlog, file) |
87 |
|
|
-log_method = file |
88 |
|
|
- |
89 |
|
|
-# Logfile (for log_method = file, '-' for stderr) |
90 |
|
|
-log_file = /var/log/zarafa/licensed.log |
91 |
|
|
- |
92 |
|
|
-# Loglevel (0=no logging, 5=full logging) |
93 |
|
|
-log_level = 2 |
94 |
|
|
- |
95 |
|
|
-# Log timestamp - prefix each log line with timestamp in 'file' logging mode |
96 |
|
|
-log_timestamp = 1 |
97 |
|
|
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 |
98 |
|
|
--- 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 |
99 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/monitor.cfg/monitor.cfg 1970-01-01 10:00:00.000000000 +1000 |
100 |
|
|
@@ -1,62 +0,0 @@ |
101 |
|
|
-############################################################## |
102 |
|
|
-# ZARAFA MONITOR SETTINGS |
103 |
|
|
- |
104 |
|
|
-# Server unix socket location |
105 |
|
|
-server_socket = file:///var/run/zarafa |
106 |
|
|
- |
107 |
|
|
-# drop privileges and run the process as this user |
108 |
|
|
-run_as_user = |
109 |
|
|
- |
110 |
|
|
-# drop privileges and run the process as this group |
111 |
|
|
-run_as_group = |
112 |
|
|
- |
113 |
|
|
-# create a pid file for stopping the service via the init.d scripts |
114 |
|
|
-pid_file = /var/run/zarafa-monitor.pid |
115 |
|
|
- |
116 |
|
|
-# run server in this path (when not using the -F switch) |
117 |
|
|
-running_path = / |
118 |
|
|
- |
119 |
|
|
-############################################################## |
120 |
|
|
-# ZARAFA MONITOR LOG SETTINGS |
121 |
|
|
- |
122 |
|
|
-# Logging method (syslog, file) |
123 |
|
|
-log_method = file |
124 |
|
|
- |
125 |
|
|
-# Loglevel (0=no logging, 5=full logging) |
126 |
|
|
-log_level = 2 |
127 |
|
|
- |
128 |
|
|
-# Logfile for log_method = file, use '-' for stderr |
129 |
|
|
-log_file = /var/log/zarafa/monitor.log |
130 |
|
|
- |
131 |
|
|
-# Log timestamp - prefix each log line with timestamp in 'file' logging mode |
132 |
|
|
-log_timestamp = 1 |
133 |
|
|
- |
134 |
|
|
-############################################################## |
135 |
|
|
-# MONITOR SSL LOGIN SETTINGS |
136 |
|
|
-# |
137 |
|
|
-# Note: server_socket must be set to https://servername:portname/zarafa |
138 |
|
|
-# to use this type of login method |
139 |
|
|
- |
140 |
|
|
-# Login to the Zarafa server using this SSL Key |
141 |
|
|
-sslkey_file = /etc/zarafa/ssl/monitor.pem |
142 |
|
|
- |
143 |
|
|
-# The password of the SSL Key |
144 |
|
|
-sslkey_pass = replace-with-monitor-cert-password |
145 |
|
|
- |
146 |
|
|
-############################################################## |
147 |
|
|
-# ZARAFA MONITOR MAIL QUOTA SETTINGS |
148 |
|
|
- |
149 |
|
|
-# Quota mail interval in days |
150 |
|
|
-mailquota_resend_interval = 1 |
151 |
|
|
- |
152 |
|
|
-# Templates to be used for quota emails which are send to the user |
153 |
|
|
-# when the various user quota levels have been exceeded. |
154 |
|
|
-userquota_warning_template = /etc/zarafa/quotamail/userwarning.mail |
155 |
|
|
-userquota_soft_template = /etc/zarafa/quotamail/usersoft.mail |
156 |
|
|
-userquota_hard_template = /etc/zarafa/quotamail/userhard.mail |
157 |
|
|
- |
158 |
|
|
-# Templates to be used for quota emails which are send to the company administrators |
159 |
|
|
-# when the various company quota levels have been exceeded. |
160 |
|
|
-companyquota_warning_template = /etc/zarafa/quotamail/companywarning.mail |
161 |
|
|
-companyquota_soft_template = /etc/zarafa/quotamail/companysoft.mail |
162 |
|
|
-companyquota_hard_template = /etc/zarafa/quotamail/companyhard.mail |
163 |
|
|
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 |
164 |
|
|
--- 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 |
165 |
|
|
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/spooler.cfg/spooler.cfg 1970-01-01 10:00:00.000000000 +1000 |
166 |
|
|
@@ -1,75 +0,0 @@ |
167 |
|
|
-############################################################## |
168 |
|
|
-# SPOOLER SETTINGS |
169 |
|
|
- |
170 |
|
|
-# Outgoing mailserver name or IP address |
171 |
|
|
-smtp_server = localhost |
172 |
|
|
- |
173 |
|
|
-# Server unix socket location |
174 |
|
|
-server_socket = file:///var/run/zarafa |
175 |
|
|
- |
176 |
|
|
-# drop privileges and run the process as this user |
177 |
|
|
-run_as_user = |
178 |
|
|
- |
179 |
|
|
-# drop privileges and run the process as this group |
180 |
|
|
-run_as_group = |
181 |
|
|
- |
182 |
|
|
-# create a pid file for stopping the service via the init.d scripts |
183 |
|
|
-pid_file = /var/run/zarafa-spooler.pid |
184 |
|
|
- |
185 |
|
|
-# run server in this path (when not using the -F switch) |
186 |
|
|
-running_path = / |
187 |
|
|
- |
188 |
|
|
-############################################################## |
189 |
|
|
-# SPOOLER LOG SETTINGS |
190 |
|
|
- |
191 |
|
|
-# Logging method (syslog, file) |
192 |
|
|
-log_method = file |
193 |
|
|
- |
194 |
|
|
-# Loglevel (0=no logging, 5=full logging) |
195 |
|
|
-log_level = 3 |
196 |
|
|
- |
197 |
|
|
-# Logfile for log_method = file, use '-' for stderr |
198 |
|
|
-log_file = /var/log/zarafa/spooler.log |
199 |
|
|
- |
200 |
|
|
-# Log timestamp - prefix each log line with timestamp in 'file' logging mode |
201 |
|
|
-log_timestamp = 1 |
202 |
|
|
- |
203 |
|
|
- |
204 |
|
|
-############################################################## |
205 |
|
|
-# SPOOLER SSL LOGIN SETTINGS |
206 |
|
|
-# |
207 |
|
|
-# Note: server_socket must be set to https://servername:portname/zarafa |
208 |
|
|
-# to use this type of login method |
209 |
|
|
- |
210 |
|
|
-# Login to the Zarafa server using this SSL Key |
211 |
|
|
-sslkey_file = /etc/zarafa/ssl/spooler.pem |
212 |
|
|
- |
213 |
|
|
-# The password of the SSL Key |
214 |
|
|
-sslkey_pass = replace-with-server-cert-password |
215 |
|
|
- |
216 |
|
|
-############################################################## |
217 |
|
|
-# SPOOLER THREAD SETTINGS |
218 |
|
|
- |
219 |
|
|
-# Maximum number of threads used to send outgoing messages |
220 |
|
|
-# Default: 5 |
221 |
|
|
-max_threads = 5 |
222 |
|
|
- |
223 |
|
|
-############################################################## |
224 |
|
|
-# SPOOLER FAXING SETTINGS |
225 |
|
|
- |
226 |
|
|
-# When sending an email that must go to a fax address, the address |
227 |
|
|
-# will be rewritten to <phonenumber>@<fax_domain> |
228 |
|
|
-fax_domain = fax.local |
229 |
|
|
- |
230 |
|
|
-# If the received number starts with a '+', it will be replaced by |
231 |
|
|
-# the fax_international value. |
232 |
|
|
-# eg. +3112345678@fax.local will be rewritten to 003112345678@fax.local |
233 |
|
|
-fax_international = 00 |
234 |
|
|
- |
235 |
|
|
-############################################################## |
236 |
|
|
-# SPOOLER DELEGATE SETTINGS |
237 |
|
|
- |
238 |
|
|
-# Set this value to 'yes' to let the spooler always send emails with |
239 |
|
|
-# delegates (other user than yourself in the From: header) |
240 |
|
|
-# In installations before 6.20, this value was always 'yes' |
241 |
|
|
-always_send_delegates = no |