1 |
dungog |
1.1 |
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 |
2 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/migrate/80zarafa 2008-12-26 17:20:54.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/migrate/80zarafa 2008-12-26 17:16:08.000000000 -0600 |
4 |
|
|
@@ -1,13 +1,4 @@ |
5 |
|
|
{ |
6 |
|
|
- $DB->set_prop('pop3', 'TCPPort', '8110'); |
7 |
|
|
- $DB->set_prop('pop3s', 'TCPPort', '8995'); |
8 |
|
|
- $DB->set_prop('imap', 'TCPPort', '8143'); |
9 |
|
|
- $DB->set_prop('imaps', 'TCPPort', '8993'); |
10 |
|
|
- $DB->set_prop('pop3', 'status', 'disabled'); |
11 |
|
|
- $DB->set_prop('pop3s', 'status', 'disabled'); |
12 |
|
|
- $DB->set_prop('imap', 'status', 'disabled'); |
13 |
|
|
- $DB->set_prop('imaps', 'status', 'disabled'); |
14 |
|
|
- |
15 |
|
|
use MIME::Base64 qw(encode_base64); |
16 |
|
|
|
17 |
|
|
my $rec = $DB->get('zarafa-server') || $DB->new_record('zarafa-server', {type => 'service'}); |
18 |
|
|
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 |
19 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2008-12-26 17:20:54.000000000 -0600 |
20 |
|
|
+++ 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 |
21 |
|
|
@@ -5,6 +5,17 @@ |
22 |
|
|
{ |
23 |
|
|
$OUT .= qq( |
24 |
|
|
# Zarafa specific configuration files. |
25 |
|
|
+ |
26 |
|
|
+ Alias /zarafa /var/www/html/webaccess/ |
27 |
|
|
+ <Directory /var/www/html/webaccess/> |
28 |
|
|
+ Options -Indexes |
29 |
|
|
+ AllowOverride None |
30 |
|
|
+ order allow,deny |
31 |
|
|
+ allow from all |
32 |
|
|
+ AddType application/x-httpd-php .php |
33 |
|
|
+ php_flag magic_quotes_gpc off |
34 |
|
|
+ php_flag track_vars on |
35 |
|
|
+ </Directory> |
36 |
|
|
|
37 |
|
|
<Directory /var/www/html/> |
38 |
|
|
Options -Indexes |
39 |
|
|
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 |
40 |
|
|
--- 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 |
41 |
|
|
+++ 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 |
42 |
|
|
@@ -15,7 +15,7 @@ |
43 |
|
|
return " # Zarafa is disabled in this VirtualHost\n" |
44 |
|
|
unless $zwebmailStatus eq 'enabled'; |
45 |
|
|
|
46 |
|
|
- foreach $place ('zarafa','webaccess','webmail','mobile','Microsoft-Server-ActiveSync') |
47 |
|
|
+ foreach $place ('zarafa','webaccess','mobile','Microsoft-Server-ActiveSync') |
48 |
|
|
{ |
49 |
|
|
if (($port eq "80") && ($haveSSL eq 'yes') && ($zwebmailAccessType eq 'SSL')) |
50 |
|
|
{ |
51 |
|
|
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 |
52 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa 2008-12-26 17:20:54.000000000 -0600 |
53 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa 2008-12-26 17:18:53.000000000 -0600 |
54 |
|
|
@@ -1,5 +1,5 @@ |
55 |
|
|
{ |
56 |
|
|
- my $zarafa = $user->prop('zarafa') || 'enabled'; |
57 |
|
|
+ my $zarafa = $user->prop('zarafa') || 'disabled'; |
58 |
|
|
return "| /usr/bin/zarafa-dagent -q $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;" |
59 |
|
|
if ($zarafa eq 'enabled'); |
60 |
|
|
} |
61 |
|
|
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 |
62 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/access 2008-10-02 10:56:39.000000000 -0500 |
63 |
|
|
+++ 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 |
64 |
|
|
@@ -1 +0,0 @@ |
65 |
|
|
-public |
66 |
|
|
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 |
67 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-gateway/TCPPort 2008-12-31 15:32:25.000000000 -0600 |
68 |
|
|
+++ 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 |
69 |
|
|
@@ -1 +0,0 @@ |
70 |
|
|
-995,993 |
71 |
|
|
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 |
72 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/access 1969-12-31 18:00:00.000000000 -0600 |
73 |
|
|
+++ 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 |
74 |
|
|
@@ -0,0 +1 @@ |
75 |
|
|
+private |
76 |
|
|
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 |
77 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/status 1969-12-31 18:00:00.000000000 -0600 |
78 |
|
|
+++ 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 |
79 |
|
|
@@ -0,0 +1 @@ |
80 |
|
|
+enabled |
81 |
|
|
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 |
82 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/TCPPort 1969-12-31 18:00:00.000000000 -0600 |
83 |
|
|
+++ 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 |
84 |
|
|
@@ -0,0 +1 @@ |
85 |
|
|
+8143 |
86 |
|
|
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 |
87 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imap/type 1969-12-31 18:00:00.000000000 -0600 |
88 |
|
|
+++ 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 |
89 |
|
|
@@ -0,0 +1 @@ |
90 |
|
|
+service |
91 |
|
|
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 |
92 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/access 1969-12-31 18:00:00.000000000 -0600 |
93 |
|
|
+++ 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 |
94 |
|
|
@@ -0,0 +1 @@ |
95 |
|
|
+public |
96 |
|
|
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 |
97 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/status 1969-12-31 18:00:00.000000000 -0600 |
98 |
|
|
+++ 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 |
99 |
|
|
@@ -0,0 +1 @@ |
100 |
|
|
+enabled |
101 |
|
|
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 |
102 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/TCPPort 1969-12-31 18:00:00.000000000 -0600 |
103 |
|
|
+++ 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 |
104 |
|
|
@@ -0,0 +1 @@ |
105 |
|
|
+8993 |
106 |
|
|
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 |
107 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-imaps/type 1969-12-31 18:00:00.000000000 -0600 |
108 |
|
|
+++ 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 |
109 |
|
|
@@ -0,0 +1 @@ |
110 |
|
|
+service |
111 |
|
|
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 |
112 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/access 1969-12-31 18:00:00.000000000 -0600 |
113 |
|
|
+++ 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 |
114 |
|
|
@@ -0,0 +1 @@ |
115 |
|
|
+private |
116 |
|
|
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 |
117 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/status 1969-12-31 18:00:00.000000000 -0600 |
118 |
|
|
+++ 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 |
119 |
|
|
@@ -0,0 +1 @@ |
120 |
|
|
+enabled |
121 |
|
|
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 |
122 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/TCPPort 1969-12-31 18:00:00.000000000 -0600 |
123 |
|
|
+++ 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 |
124 |
|
|
@@ -0,0 +1 @@ |
125 |
|
|
+8110 |
126 |
|
|
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 |
127 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3/type 1969-12-31 18:00:00.000000000 -0600 |
128 |
|
|
+++ 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 |
129 |
|
|
@@ -0,0 +1 @@ |
130 |
|
|
+service |
131 |
|
|
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 |
132 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/access 1969-12-31 18:00:00.000000000 -0600 |
133 |
|
|
+++ 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 |
134 |
|
|
@@ -0,0 +1 @@ |
135 |
|
|
+public |
136 |
|
|
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 |
137 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/status 1969-12-31 18:00:00.000000000 -0600 |
138 |
|
|
+++ 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 |
139 |
|
|
@@ -0,0 +1 @@ |
140 |
|
|
+enabled |
141 |
|
|
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 |
142 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/TCPPort 1969-12-31 18:00:00.000000000 -0600 |
143 |
|
|
+++ 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 |
144 |
|
|
@@ -0,0 +1 @@ |
145 |
|
|
+8995 |
146 |
|
|
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 |
147 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-pop3s/type 1969-12-31 18:00:00.000000000 -0600 |
148 |
|
|
+++ 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 |
149 |
|
|
@@ -0,0 +1 @@ |
150 |
|
|
+service |
151 |
|
|
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 |
152 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-server/TCPPort 2008-12-31 15:32:24.000000000 -0600 |
153 |
|
|
+++ 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 |
154 |
|
|
@@ -1 +1 @@ |
155 |
|
|
-237 |
156 |
|
|
+236 |
157 |
|
|
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 |
158 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/access 1969-12-31 18:00:00.000000000 -0600 |
159 |
|
|
+++ 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 |
160 |
|
|
@@ -0,0 +1 @@ |
161 |
|
|
+public |
162 |
|
|
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 |
163 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/status 1969-12-31 18:00:00.000000000 -0600 |
164 |
|
|
+++ 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 |
165 |
|
|
@@ -0,0 +1 @@ |
166 |
|
|
+enabled |
167 |
|
|
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 |
168 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/TCPPort 1969-12-31 18:00:00.000000000 -0600 |
169 |
|
|
+++ 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 |
170 |
|
|
@@ -0,0 +1 @@ |
171 |
|
|
+237 |
172 |
|
|
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 |
173 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ssl/type 1969-12-31 18:00:00.000000000 -0600 |
174 |
|
|
+++ 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 |
175 |
|
|
@@ -0,0 +1 @@ |
176 |
|
|
+service |
177 |
|
|
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 |
178 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2008-12-31 15:32:25.000000000 -0600 |
179 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2008-12-30 16:35:36.000000000 -0600 |
180 |
|
|
@@ -3,40 +3,24 @@ |
181 |
|
|
/bin/echo "initialize-default-databases" |
182 |
|
|
/etc/e-smith/events/actions/initialize-default-databases |
183 |
|
|
|
184 |
|
|
-/bin/echo "set users to use zarafa" |
185 |
|
|
-/etc/e-smith/events/actions/qmail-update-user |
186 |
|
|
- |
187 |
|
|
-/bin/echo "reassign and disable sme gateway ports" |
188 |
|
|
-/sbin/e-smith/config setprop pop3 TCPPort 8110 |
189 |
|
|
-/sbin/e-smith/config setprop pop3s TCPPort 8995 |
190 |
|
|
-/sbin/e-smith/config setprop imap TCPPort 8143 |
191 |
|
|
-/sbin/e-smith/config setprop imaps TCPPort 8993 |
192 |
|
|
-/sbin/e-smith/config setprop pop3 status disabled |
193 |
|
|
-/sbin/e-smith/config setprop pop3s status disabled |
194 |
|
|
-/sbin/e-smith/config setprop imap status disabled |
195 |
|
|
-/sbin/e-smith/config setprop imaps status disabled |
196 |
|
|
-/usr/bin/sv d /service/pop3 |
197 |
|
|
-/usr/bin/sv d /service/pop3s |
198 |
|
|
-/usr/bin/sv d /service/imap |
199 |
|
|
-/usr/bin/sv d /service/imaps |
200 |
|
|
-/sbin/e-smith/expand-template /etc/rc.d/init.d/masq |
201 |
|
|
-/etc/init.d/masq restart |
202 |
|
|
- |
203 |
|
|
-#is this needed, it stalls during install ? |
204 |
|
|
-#/bin/echo "signal-events" |
205 |
|
|
-#/sbin/e-smith/signal-event remoteaccess-update |
206 |
|
|
+/bin/echo "signal-event remoteaccess-update" |
207 |
|
|
+/sbin/e-smith/signal-event remoteaccess-update |
208 |
|
|
|
209 |
|
|
/bin/echo "webaccess config" |
210 |
|
|
/bin/chown -R www:www /var/www/html/webaccess/tmp |
211 |
|
|
/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf |
212 |
|
|
/usr/bin/sv restart /service/httpd-e-smith |
213 |
|
|
|
214 |
|
|
-/bin/echo "expanding zarafa templates" |
215 |
|
|
-/etc/e-smith/events/actions/zarafa-expand-templates |
216 |
|
|
- |
217 |
|
|
/bin/echo "creating zarafa database" |
218 |
|
|
/etc/e-smith/events/actions/zarafa-create-database |
219 |
|
|
|
220 |
|
|
+/bin/echo "Enter your user plugin. Values: unix, db, ldap" |
221 |
|
|
+read USERPLUGIN |
222 |
|
|
+/sbin/e-smith/config setprop zarafa-server Plugin $USERPLUGIN |
223 |
|
|
+ |
224 |
|
|
+/bin/echo "expanding zarafa templates" |
225 |
|
|
+/etc/e-smith/events/actions/zarafa-expand-templates |
226 |
|
|
+ |
227 |
|
|
/bin/echo "starting services" |
228 |
|
|
/etc/e-smith/events/actions/zarafa-services start |
229 |
|
|
|
230 |
|
|
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 |
231 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/dagent.cfg/dagent.cfg 2008-09-17 19:43:22.000000000 -0500 |
232 |
|
|
+++ 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 |
233 |
|
|
@@ -1,7 +1,7 @@ |
234 |
|
|
############################################################## |
235 |
|
|
# DAGENT SETTINGS |
236 |
|
|
|
237 |
|
|
-server_socket = https://localhost:237/zarafa |
238 |
|
|
+server_socket = file:///var/run/zarafa |
239 |
|
|
|
240 |
|
|
############################################################## |
241 |
|
|
# DAGENT SSL LOGIN SETTINGS |
242 |
|
|
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 |
243 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/gateway.cfg/gateway.cfg 2008-12-31 15:32:25.000000000 -0600 |
244 |
|
|
+++ 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 |
245 |
|
|
@@ -3,7 +3,7 @@ |
246 |
|
|
|
247 |
|
|
server_bind = 0.0.0.0 |
248 |
|
|
|
249 |
|
|
-server_socket = http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa |
250 |
|
|
+server_socket = http://localhost:{${'zarafa-server'}{TCPPort}||'236';}/zarafa |
251 |
|
|
|
252 |
|
|
# drop privileges and run the process as this user |
253 |
|
|
run_as_user = |
254 |
|
|
@@ -18,20 +18,20 @@ |
255 |
|
|
running_path = / |
256 |
|
|
|
257 |
|
|
# enable/disable POP3, and POP3 listen port |
258 |
|
|
-pop3_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
259 |
|
|
-pop3_port = { ${'zarafa-gateway'}{pop3port} || '110'; } |
260 |
|
|
+pop3_enable = { if (${'zarafa-pop3'}{status} eq 'enabled') {'yes'} else {'no'}; } |
261 |
|
|
+pop3_port = { ${'zarafa-pop3'}{TCPPort} || '8110'; } |
262 |
|
|
|
263 |
|
|
# enable/disable Secure POP3, and Secure POP3 listen port |
264 |
|
|
-pop3s_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
265 |
|
|
-pop3s_port = { ${'zarafa-gateway'}{pop3sport} || '995'; } |
266 |
|
|
+pop3s_enable = { if (${'zarafa-pop3s'}{status} eq 'enabled') {'yes'} else {'no'}; } |
267 |
|
|
+pop3s_port = { ${'zarafa-pop3s'}{TCPPort} || '8995'; } |
268 |
|
|
|
269 |
|
|
# enable/disable IMAP, and IMAP listen port |
270 |
|
|
-imap_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
271 |
|
|
-imap_port = { ${'zarafa-gateway'}{imapport} || '143'; } |
272 |
|
|
+imap_enable = { if (${'zarafa-imap'}{status} eq 'enabled') {'yes'} else {'no'}; } |
273 |
|
|
+imap_port = { ${'zarafa-imap'}{TCPPort} || '8143'; } |
274 |
|
|
|
275 |
|
|
# enable/disable Secure IMAP, and Secure IMAP listen port |
276 |
|
|
-imaps_enable = { if (${'zarafa-gateway'}{status} eq 'enabled') {'yes'} else {'no'}; } |
277 |
|
|
-imaps_port = { ${'zarafa-gateway'}{imapsport} || '993'; } |
278 |
|
|
+imaps_enable = { if (${'zarafa-imaps'}{status} eq 'enabled') {'yes'} else {'no'}; } |
279 |
|
|
+imaps_port = { ${'zarafa-imaps'}{TCPPort} || '8993'; } |
280 |
|
|
|
281 |
|
|
# Only mail folder for IMAP or all subfolders (calendar, contacts, tasks, etc. too) |
282 |
|
|
imap_only_mailfolders = yes |
283 |
|
|
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 |
284 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-12-31 15:32:25.000000000 -0600 |
285 |
|
|
+++ 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 |
286 |
|
|
@@ -10,7 +10,7 @@ |
287 |
|
|
server_tcp_enabled = yes |
288 |
|
|
|
289 |
|
|
# Port to bind to |
290 |
|
|
-server_tcp_port = { ${'zarafa-server'}{tcpport} || '236'; } |
291 |
|
|
+server_tcp_port = { ${'zarafa-server'}{TCPPort} || '236'; } |
292 |
|
|
|
293 |
|
|
# Accept unix pipe connections (not recommended to disable) |
294 |
|
|
server_pipe_enabled = yes |
295 |
|
|
@@ -98,7 +98,7 @@ |
296 |
|
|
server_ssl_enabled = no |
297 |
|
|
|
298 |
|
|
# Listen for SSL connections on this port |
299 |
|
|
-server_ssl_port = { ${'zarafa-server'}{TCPPort} || '237'; } |
300 |
|
|
+server_ssl_port = { ${'zarafa-ssl'}{TCPPort} || '237'; } |
301 |
|
|
|
302 |
|
|
# Required Server certificate, contains the certificate and the private key parts |
303 |
|
|
server_ssl_key_file = /home/e-smith/ssl.pem/{$SystemName}.{$DomainName}.pem |