1 |
vip-ire |
1.21 |
# $Id: e-smith-apache.spec,v 1.20 2014/10/31 11:42:12 vip-ire Exp $ |
2 |
slords |
1.11 |
|
3 |
slords |
1.1 |
Summary: e-smith server and gateway - apache module |
4 |
|
|
%define name e-smith-apache |
5 |
|
|
Name: %{name} |
6 |
slords |
1.4 |
%define version 2.2.0 |
7 |
vip-ire |
1.21 |
%define release 15 |
8 |
slords |
1.1 |
Version: %{version} |
9 |
|
|
Release: %{release}%{?dist} |
10 |
|
|
License: GPL |
11 |
|
|
Group: Networking/Daemons |
12 |
|
|
Source: %{name}-%{version}.tar.gz |
13 |
snetram |
1.5 |
Patch0: e-smith-apache-2.2.0-AddOffice2007MIMETypes.patch |
14 |
snetram |
1.7 |
Patch1: e-smith-apache-2.2.0-AddOpenOfficeMIMETypes.patch |
15 |
snetram |
1.8 |
Patch2: e-smith-apache-2.2.0-AddXMLMIMEType.patch |
16 |
snetram |
1.9 |
Patch3: e-smith-apache-2.2.0-AddOpenOffice2MIMETypes.patch |
17 |
snetram |
1.10 |
Patch4: e-smith-apache-2.2.0-optionDisableSSLv2.patch |
18 |
snetram |
1.12 |
Patch5: e-smith-apache-2.2.0-disable-SSLv2.patch |
19 |
snetram |
1.13 |
Patch6: e-smith-apache-2.2.0-server-resources-redirect-fix.patch |
20 |
wellsi |
1.14 |
Patch7: e-smith-apache-2.2.0-disableIconsIndex.patch |
21 |
mrjhb3 |
1.16 |
Patch8: e-smith-apache-2.2.0-apache_modules.patch |
22 |
wellsi |
1.17 |
Patch9: e-smith-apache-2.2.0-35SSL10SSLCipherSuite.patch |
23 |
vip-ire |
1.21 |
Patch10: e-smith-apache-2.2.0-disable_sslv3.patch |
24 |
slords |
1.1 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
25 |
|
|
BuildArchitectures: noarch |
26 |
|
|
Requires: e-smith-base >= 4.15.1 |
27 |
|
|
Requires: e-smith-lib >= 1.15.1-19 |
28 |
|
|
Requires: e-smith-daemontools >= 1.7.1-01 |
29 |
|
|
Obsoletes: e-smith-proxypass |
30 |
|
|
Obsoletes: e-smith-apache-proxy |
31 |
|
|
Conflicts: e-smith-ibays < 1.0.2 |
32 |
|
|
AutoReqProv: no |
33 |
|
|
BuildRequires: e-smith-devtools >= 1.11.0-12 |
34 |
|
|
|
35 |
|
|
%description |
36 |
|
|
e-smith server and gateway software - apache module. |
37 |
|
|
|
38 |
|
|
%changelog |
39 |
vip-ire |
1.21 |
* Tue Dec 9 2014 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-15.sme |
40 |
|
|
- Disable SSLv3 [SME: 8710] |
41 |
|
|
|
42 |
vip-ire |
1.20 |
* Fri Oct 31 2014 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-14.sme |
43 |
|
|
- Revert CRIME mitigation patch, as it's not needed [SME: 8614] |
44 |
|
|
|
45 |
vip-ire |
1.18 |
* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-13.sme |
46 |
vip-ire |
1.19 |
- Mitigate CRIME, CVE-2012-4929 [SME: 8614] |
47 |
vip-ire |
1.18 |
|
48 |
wellsi |
1.17 |
* Mon Jan 13 2014 Ian Wells <esmith@wellsi.com> 2.2.0-12.sme |
49 |
|
|
- Remove insecure ciphers [SME: 7916] |
50 |
|
|
|
51 |
mrjhb3 |
1.16 |
* Mon Oct 07 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.2.0-11.sme |
52 |
|
|
- Re-do patch to add missing default httpd.conf modules [SME: 7871] |
53 |
|
|
|
54 |
mrjhb3 |
1.15 |
* Fri Oct 04 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.2.0-10.sme |
55 |
|
|
- Patch to add missing default httpd.conf modules [SME: 7871] |
56 |
|
|
|
57 |
wellsi |
1.14 |
* Fri Jun 29 2012 Ian Wells <esmith@wellsi.com> 2.2.0-9.sme |
58 |
|
|
- Disable index listing of Apache icons folder [SME: 7015] |
59 |
|
|
|
60 |
snetram |
1.13 |
* Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme |
61 |
|
|
- Fix server-resources redirect w/o trailing slash [SME: 6758] |
62 |
|
|
|
63 |
snetram |
1.12 |
* Sat Mar 12 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-7.sme |
64 |
|
|
- Disable SSLv2 by default [SME: 6482] |
65 |
|
|
|
66 |
snetram |
1.10 |
* Sun Apr 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme |
67 |
|
|
- Add option to disable SSLv2 [SME: 5034] |
68 |
|
|
|
69 |
snetram |
1.9 |
* Sat Mar 28 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme |
70 |
|
|
- Add OpenOffice2 MIME Types [SME: 5112] |
71 |
|
|
|
72 |
snetram |
1.7 |
* Sat Mar 7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme |
73 |
snetram |
1.9 |
- Add OpenOffice MIME Types [SME: 4848] |
74 |
snetram |
1.7 |
- Add XML MIME Type [SME: 5035] |
75 |
|
|
|
76 |
snetram |
1.6 |
* Thu Dec 11 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-3.sme |
77 |
|
|
- Fix issues in patch that adds Microsoft Office 2007 MIME types [SME: 4548] |
78 |
|
|
|
79 |
snetram |
1.5 |
* Tue Dec 2 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme |
80 |
|
|
- Add Microsoft Office 2007 MIME types [SME: 4548] |
81 |
|
|
|
82 |
slords |
1.4 |
* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme |
83 |
|
|
- Roll new stream to separate sme7/sme8 trees [SME: 4633] |
84 |
|
|
|
85 |
bytegw |
1.3 |
* Tue Oct 23 2007 Filippo Carletti <filippo.carletti@gmail.com> 1.2.0-16 |
86 |
|
|
- Add SSL support to ProxyPass. [SME: 3481] |
87 |
|
|
|
88 |
slords |
1.2 |
* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-15 |
89 |
|
|
- Create/Move httpd logrotate.d directory. [SME: 3380] |
90 |
|
|
|
91 |
|
|
* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-14 |
92 |
|
|
- Rename apache to httpd in templates2expand. [SME: 3380] |
93 |
|
|
|
94 |
slords |
1.1 |
* Wed Jun 6 2007 Shad L. Lords <slords@mail.com> 1.2.0-13 |
95 |
|
|
- Fix patch to exclude hosts if domains exist [SME: 2307] |
96 |
|
|
|
97 |
|
|
* Fri May 18 2007 Shad L. Lords <slords@mail.com> 1.2.0-12 |
98 |
|
|
- Use correct lib for modules |
99 |
|
|
|
100 |
|
|
* Sun Apr 29 2007 Shad L. Lords <slords@mail.com> |
101 |
|
|
- Clean up spec so package can be built by koji/plague |
102 |
|
|
|
103 |
|
|
* Fri Feb 23 2007 Shad L. Lords <slords@mail.com> 1.2.0-11 |
104 |
|
|
- Fix patch so template expands [SME: 2307] |
105 |
|
|
|
106 |
|
|
* Fri Feb 23 2007 Shad L. Lords <slords@mail.com> 1.2.0-10 |
107 |
|
|
- Don't include host if domain exists [SME: 2307] |
108 |
|
|
|
109 |
|
|
* Tue Feb 13 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.0-9 |
110 |
|
|
- Gracefully handle differences in module names between apache |
111 |
|
|
versions. [SME: 2471] |
112 |
|
|
- Add logrotate changes which should have been in 1.2.0-7 (patch |
113 |
|
|
was provided but not applied). |
114 |
|
|
|
115 |
|
|
* Sat Jan 27 2007 Shad L. Lords <slords@mail.com> 1.2.0-8 |
116 |
|
|
- Remove proxypass fragment (now in e-smith-manager) |
117 |
|
|
|
118 |
|
|
* Sat Jan 27 2007 Shad L. Lords <slords@mail.com> 1.2.0-8 |
119 |
|
|
- Remove proxypass fragment (now in e-smith-manager) |
120 |
|
|
|
121 |
|
|
* Fri Jan 19 2007 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-7 |
122 |
|
|
- Move logrotate fragments from e-smith-base. |
123 |
|
|
|
124 |
|
|
* Thu Dec 21 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-6 |
125 |
|
|
- Add support for optional modSSL{CertificateChainFile} [SME: 1779] |
126 |
|
|
|
127 |
|
|
* Thu Dec 07 2006 Shad L. Lords <slords@mail.com> |
128 |
|
|
- Update to new release naming. No functional changes. |
129 |
|
|
- Make Packager generic |
130 |
|
|
|
131 |
|
|
* Wed Nov 29 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-04 |
132 |
|
|
- Revert last change [SME: 2109] |
133 |
|
|
- TODO: Split dev stream for that change |
134 |
|
|
- Add Conflicts for latest e-smith-manager dev stream |
135 |
|
|
|
136 |
|
|
* Wed Nov 08 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-03 |
137 |
|
|
- Remove manager proxy pass fragment - moved to e-smith-manager. |
138 |
|
|
|
139 |
|
|
* Sat Jul 15 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-02 |
140 |
|
|
- Add ProxyPassReverse directives to allow redirects to work for proxy- |
141 |
|
|
passed virtual domains. Also proxy pass https to https. [SME: 1735] |
142 |
|
|
|
143 |
|
|
* Tue Mar 14 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-01 |
144 |
|
|
- Roll stable stream version. [SME: 1016] |
145 |
|
|
|
146 |
|
|
* Mon Mar 13 2006 Charlie Brady <charlie_brady@mitel.com> 1.1.2-37 |
147 |
|
|
- Fix lookup of 'httpd' props in a few templates. Service name is |
148 |
|
|
httpd-e-smith. [SME: 1029] |
149 |
|
|
|
150 |
|
|
* Fri Feb 10 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-36 |
151 |
|
|
- Deny access to files starting with .ht typically |
152 |
|
|
.htaccess and .htpasswd [SME: 716] |
153 |
|
|
|
154 |
|
|
* Tue Jan 31 2006 Gavin Weight <gweight@gmail.com> 1.1.2-35 |
155 |
|
|
- Change modPerl from enabled to disabled [SME: 575] |
156 |
|
|
|
157 |
|
|
* Fri Jan 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-34 |
158 |
|
|
- Add SVG filetype [SME: 374] |
159 |
|
|
|
160 |
|
|
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-33 |
161 |
|
|
- And relocate the modSSL{CipherSuite} default to e-smith-base with |
162 |
|
|
the other modSSL defaults [SME: 194] |
163 |
|
|
|
164 |
|
|
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-32 |
165 |
|
|
- Change default CipherSuite [SME: 194] |
166 |
|
|
Was: ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:-LOW:+SSLv2:-EXP |
167 |
|
|
Is: ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM |
168 |
|
|
|
169 |
|
|
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-31 |
170 |
|
|
- Moved SSL CipherSuite into db default - modSSL{CipherSuite} [SME: 194] |
171 |
|
|
|
172 |
|
|
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-30 |
173 |
|
|
- Remove inode from FileETag response [SME: 198] |
174 |
|
|
|
175 |
|
|
* Wed Dec 14 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-29 |
176 |
|
|
- Use literal HERE document to ensure braces in TRACE/TRACK rewrite [SME: 196] |
177 |
|
|
|
178 |
|
|
* Wed Dec 14 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-28 |
179 |
|
|
- Add type for XSL stylesheet (.xsl) files [SME: 76] |
180 |
|
|
|
181 |
|
|
* Wed Nov 30 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-27 |
182 |
|
|
- Bump release number only |
183 |
|
|
|
184 |
|
|
* Wed Aug 17 2005 Charlie Brady <charlieb@e-smith.com> |
185 |
|
|
- [1.1.2-26] |
186 |
|
|
- Add content from e-smith-apache-proxy, to enable apache to |
187 |
|
|
also operate as a non-caching proxy server. Add Obsoletes: |
188 |
|
|
header to ensure e-smith-apache-proxy RPM is removed on |
189 |
|
|
upgrade. |
190 |
|
|
|
191 |
|
|
* Tue Aug 9 2005 Shad Lords <slords@mail.com> |
192 |
|
|
- [1.1.2-25] |
193 |
|
|
- Add directive for icons directory |
194 |
|
|
- Fix newlines left on end of icons template |
195 |
|
|
- Update server aliases to reference all local hosts [SF: 1246172] |
196 |
|
|
|
197 |
|
|
* Wed Aug 3 2005 Shad Lords <slords@mail.com> |
198 |
|
|
- [1.1.2-24] |
199 |
|
|
- Fix Rewrite rule to include trailing stuff |
200 |
|
|
|
201 |
|
|
* Wed Aug 3 2005 Shad Lords <slords@mail.com> |
202 |
|
|
- [1.1.2-23] |
203 |
|
|
- Update ProxyPass to use httpd-admin{TCPPort} [SF: 1246986] |
204 |
|
|
|
205 |
|
|
* Wed Jul 27 2005 Charlie Brady <charlieb@e-smith.com> |
206 |
|
|
- [1.1.2-22] |
207 |
|
|
- Disable HTTP TRACK and TRACE in each VirtualDomain (patch by Gordon |
208 |
|
|
Rowell, with some further work by Shad Lords). [SF: 1240658] |
209 |
|
|
|
210 |
|
|
* Wed Jul 27 2005 Gordon Rowell <gordonr@gormand.com.au> |
211 |
|
|
- [1.1.2-21] |
212 |
|
|
- Disable all low grade ciphers for SSL. [SF: 1240654] |
213 |
|
|
|
214 |
|
|
* Tue Jul 19 2005 Charlie Brady <charlieb@e-smith.com> |
215 |
|
|
- [1.1.2-20] |
216 |
|
|
- Don't load userdir module by default. It's not used, and causes |
217 |
|
|
Nessus to complain. [SF: 1240657] |
218 |
|
|
|
219 |
|
|
* Mon Jul 18 2005 Charlie Brady <charlieb@e-smith.com> |
220 |
|
|
- [1.1.2-19] |
221 |
|
|
- Patch from Shad: update rewrite and ProxyPass stuff for manager URLs. |
222 |
|
|
[SF: 1172203] |
223 |
|
|
|
224 |
|
|
* Mon Jul 18 2005 Charlie Brady <charlieb@e-smith.com> |
225 |
|
|
- [1.1.2-18] |
226 |
|
|
- Add GPL COPYING file. |
227 |
|
|
|
228 |
|
|
* Mon Jul 18 2005 Charlie Brady <charlieb@e-smith.com> |
229 |
|
|
- [1.1.2-17] |
230 |
|
|
- Clean up apache templates to use current DB interfaces. |
231 |
|
|
- Make sure the single host ValidFrom specs for proxypass doesn't |
232 |
|
|
upset apache. |
233 |
|
|
|
234 |
|
|
* Tue Jun 21 2005 Charlie Brady <charlieb@e-smith.com> |
235 |
|
|
- [1.1.2-16] |
236 |
|
|
- Make sure that DocumentRoot directory exists - latest apache2 |
237 |
|
|
will not start up if not. |
238 |
|
|
|
239 |
|
|
* Fri Jun 17 2005 Charlie Brady <charlieb@e-smith.com> |
240 |
|
|
- [1.1.2-15] |
241 |
|
|
- Do graceful restart of apache in domain-*, in case domain->ibay |
242 |
|
|
assignments have changed. [SF: 1222433] |
243 |
|
|
|
244 |
|
|
* Wed Jun 8 2005 Charlie Brady <charlieb@e-smith.com> |
245 |
|
|
- [1.1.2-14] |
246 |
|
|
- Add rewrite fragment for httpd.conf to disable TRACE and TRACK |
247 |
|
|
requests. |
248 |
|
|
|
249 |
|
|
* Fri May 27 2005 Charlie Brady <charlieb@e-smith.com> |
250 |
|
|
- [1.1.2-13] |
251 |
|
|
- Add support for TemplatePath => ProxyPassVirtualHost entries |
252 |
|
|
in domains db. |
253 |
|
|
|
254 |
|
|
* Fri May 27 2005 Charlie Brady <charlieb@e-smith.com> |
255 |
|
|
- [1.1.2-12] |
256 |
|
|
- Bring ProxyPass fragment up to latest e-smith-lib APIs. |
257 |
|
|
|
258 |
|
|
* Fri May 27 2005 Charlie Brady <charlieb@e-smith.com> |
259 |
|
|
- [1.1.2-11] |
260 |
|
|
- Remove ProxyPass support for various deprecated URIs. [SF: 1172203] |
261 |
|
|
- Add content of e-smith-proxypass RPM. Add Obsoletes: header. |
262 |
|
|
|
263 |
|
|
* Wed Mar 30 2005 Charlie Brady <charlieb@e-smith.com> |
264 |
|
|
- [1.1.2-10] |
265 |
|
|
- Add default TCPPort property to httpd-e-smith, so that correct |
266 |
|
|
hole is punched in firewall. |
267 |
|
|
|
268 |
|
|
* Mon Mar 21 2005 Charlie Brady <charlieb@e-smith.com> |
269 |
|
|
- [1.1.2-09] |
270 |
|
|
- Remove mangling of syslog and apache log filenames - just |
271 |
|
|
retargeting the symlinks has the same effect. [MN00064132] |
272 |
|
|
|
273 |
|
|
* Sun Mar 20 2005 Charlie Brady <charlieb@e-smith.com> |
274 |
|
|
- [1.1.2-08] |
275 |
|
|
- Remove logrotate-httpd which is obsoleted by generic_template_expand. |
276 |
|
|
|
277 |
|
|
* Wed Mar 16 2005 Charlie Brady <charlieb@e-smith.com> |
278 |
|
|
- [1.1.2-07] |
279 |
|
|
- Fix dangling symlink in ibay-create. [MN00065576] |
280 |
|
|
|
281 |
|
|
* Mon Mar 14 2005 Charlie Brady <charlieb@e-smith.com> |
282 |
|
|
- [1.1.2-06] |
283 |
|
|
- Use generic_template_expand action where possible, in place |
284 |
|
|
of specific actions. Update e-smith-lib dependency. [MN00064130] |
285 |
|
|
- Replace all restart-* and most reload-* actions with calls to 'adjust-services'. |
286 |
|
|
Update e-smith-lib version dependency. [MN00065576] |
287 |
|
|
|
288 |
|
|
* Tue Feb 22 2005 Charlie Brady <charlieb@e-smith.com> |
289 |
|
|
- [1.1.2-05] |
290 |
|
|
- Don't attempt to configure httpd.conf in post-install and post-upgrade. |
291 |
|
|
[MN00065717] |
292 |
|
|
|
293 |
|
|
* Tue Jan 25 2005 Charlie Brady <charlieb@e-smith.com> |
294 |
|
|
- [1.1.2-04] |
295 |
|
|
- Remove stray ServiceLink sylinks. [MN00064757] |
296 |
|
|
|
297 |
|
|
* Tue Dec 28 2004 Charlie Brady <charlieb@e-smith.com> |
298 |
|
|
- [1.1.2-03] |
299 |
|
|
- Add "chpst -P" to httpd-e-smith run script, to protect runsv/supervise |
300 |
|
|
from term signals (wrongly) relayed by apache. [charlieb MN00051144] |
301 |
|
|
|
302 |
|
|
* Fri Dec 24 2004 Charlie Brady <charlieb@e-smith.com> |
303 |
|
|
- [1.1.2-02] |
304 |
|
|
- Remove ValidFrom defaults fragment for httpd-admin - as it duplicates |
305 |
|
|
one in e-smith-base. [MN00062533] |
306 |
|
|
|
307 |
|
|
* Wed Nov 17 2004 Mark Knox <markk@e-smith.com> |
308 |
|
|
- [1.1.2-01] |
309 |
|
|
- Picking up new directory. MN00056429. |
310 |
|
|
|
311 |
|
|
* Wed Nov 17 2004 Mark Knox <markk@e-smith.com> |
312 |
|
|
- [1.1.1-03] |
313 |
|
|
- Added empty ValidFrom defaults fragment [markk MN00056429] |
314 |
|
|
|
315 |
|
|
* Tue Nov 9 2004 Charlie Brady <charlieb@e-smith.com> |
316 |
|
|
- [1.1.1-02] |
317 |
|
|
- Modify config and run script for compatibility with apache 2. Most of these |
318 |
|
|
changes were contributed by Shad Lords. [charlieb MN00051144] |
319 |
|
|
|
320 |
|
|
* Mon Oct 4 2004 Charlie Brady <charlieb@e-smith.com> |
321 |
|
|
- [1.1.1-01] |
322 |
|
|
- New development stream for apache 2 - 1.1.1 |
323 |
|
|
|
324 |
|
|
* Fri Sep 3 2004 Charlie Brady <charlieb@e-smith.com> |
325 |
|
|
- [1.1.0-23] |
326 |
|
|
- Clean BuildRequires. [charlieb MN00043055] |
327 |
|
|
|
328 |
|
|
* Tue Jul 13 2004 Michael Soulier <msoulier@e-smith.com> |
329 |
|
|
- [1.1.0-22] |
330 |
|
|
- Updated modPerl templates to remove use of esmith::config. |
331 |
|
|
[msoulier MN00039579] |
332 |
|
|
|
333 |
|
|
* Tue Jun 22 2004 Michael Soulier <msoulier@e-smith.com> |
334 |
|
|
- [1.1.0-21] |
335 |
|
|
- Added RewriteCond statements to previous RewriteRules to exclude localhost, |
336 |
|
|
so ssh port-forwarding is not broken. [msoulier MN00020885] |
337 |
|
|
|
338 |
|
|
* Fri Jun 18 2004 Tony Clayton <apc@e-smith.com> |
339 |
|
|
- [1.1.0-20] |
340 |
|
|
- Fix LoadModule fragment from last patch [tonyc 11348] |
341 |
|
|
|
342 |
|
|
* Mon Jun 14 2004 Tony Clayton <apc@e-smith.com> |
343 |
|
|
- [1.1.0-19] |
344 |
|
|
- Add modPerl service and httpd.conf templates [tonyc 11348] |
345 |
|
|
|
346 |
|
|
* Mon May 10 2004 Michael Soulier <msoulier@e-smith.com> |
347 |
|
|
- [1.1.0-18] |
348 |
|
|
- Adding rewrite rules to prevent plaintext access to the server manager. |
349 |
|
|
[msoulier MN00020885] |
350 |
|
|
|
351 |
|
|
* Thu May 6 2004 Michael Soulier <msoulier@e-smith.com> |
352 |
|
|
- [1.1.0-17] |
353 |
|
|
- Added httpd-admin's remoteaccess list to permissible networks for |
354 |
|
|
server-resources. [msoulier MN00024949] |
355 |
|
|
|
356 |
|
|
* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com> |
357 |
|
|
- [1.1.0-16] |
358 |
|
|
- Backing-out last change. [msoulier dpar-21489] |
359 |
|
|
|
360 |
|
|
* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com> |
361 |
|
|
- [1.1.0-15] |
362 |
|
|
- Added restart-httpd-graceful to domain-* events. [msoulier dpar-21489] |
363 |
|
|
|
364 |
|
|
* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com> |
365 |
|
|
- [1.1.0-14] |
366 |
|
|
- Updating requires to e-smith-daemontools. [msoulier 7629] |
367 |
|
|
|
368 |
|
|
* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com> |
369 |
|
|
- [1.1.0-13] |
370 |
|
|
- Updating restart-httpd-graceful to use new daemontools sigusr1 option. |
371 |
|
|
[msoulier 7629] |
372 |
|
|
|
373 |
|
|
* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com> |
374 |
|
|
- [1.1.0-12] |
375 |
|
|
- Staggering the symlinks a little farther. [msoulier 9955] |
376 |
|
|
|
377 |
|
|
* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com> |
378 |
|
|
- [1.1.0-11] |
379 |
|
|
- Adding symlinks to the service-domain-create event for httpd restart. |
380 |
|
|
[msoulier 9955] |
381 |
|
|
|
382 |
|
|
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com> |
383 |
|
|
- [1.1.0-10] |
384 |
|
|
- Fixed another error in the specfile, resulting in incorrect file |
385 |
|
|
permissions. [msoulier 7629] |
386 |
|
|
- Updated action scripts for supervise. [msoulier 7629] |
387 |
|
|
|
388 |
|
|
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com> |
389 |
|
|
- [1.1.0-09] |
390 |
|
|
- Fixed an error in the specfile. [msoulier 7629] |
391 |
|
|
|
392 |
|
|
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com> |
393 |
|
|
- [1.1.0-08] |
394 |
|
|
- Updated createlinks for daemontools. [msoulier 7629] |
395 |
|
|
|
396 |
|
|
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com> |
397 |
|
|
- [1.1.0-07] |
398 |
|
|
- Putting httpd-e-smith under supervision. [msoulier 7629] |
399 |
|
|
|
400 |
|
|
* Thu Sep 18 2003 Michael Soulier <msoulier@e-smith.com> |
401 |
|
|
- [1.1.0-06] |
402 |
|
|
- Added a null-string return value to the end of 00Setup, ensure no output |
403 |
|
|
from that fragment. [msoulier 9803] |
404 |
|
|
|
405 |
|
|
* Wed Sep 3 2003 Charlie Brady <charlieb@e-smith.com> |
406 |
|
|
- [1.1.0-05] |
407 |
|
|
- Use implementation class, not virtual class in VirtualHosts/00Setup fragment. |
408 |
|
|
[charlieb 9803] |
409 |
|
|
|
410 |
|
|
* Wed Sep 3 2003 Michael Soulier <msoulier@e-smith.com> |
411 |
|
|
- [1.1.0-04] |
412 |
|
|
- Added a 75AddType05.exe fragment to specify a proper mime-type for .exe |
413 |
|
|
files. [msoulier 9866] |
414 |
|
|
|
415 |
|
|
* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com> |
416 |
|
|
- [1.1.0-03] |
417 |
|
|
- Allow TemplatePath property in domain record to specify an alternate template |
418 |
|
|
subdir for virtual host content specification (e.g. to proxypass a domain). |
419 |
|
|
[charlieb 8409] |
420 |
|
|
|
421 |
|
|
* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com> |
422 |
|
|
- [1.1.0-02] |
423 |
|
|
- Changed the VirtualHosts subtemplate to pass the domain object instead of db handle, |
424 |
|
|
and modified VirtualHosts/00Setup fragment to convert it to the right class. |
425 |
|
|
Fix scoping problem with the blessed object. [charlieb 9803] |
426 |
|
|
|
427 |
|
|
* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com> |
428 |
|
|
- [1.1.0-01] |
429 |
|
|
- rolling to dev stream - 1.1.0 |
430 |
|
|
|
431 |
|
|
* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com> |
432 |
|
|
- [1.0.0-04] |
433 |
|
|
- Added a 00Setup fragment to VirtualHosts to process the %domainsdb hash back |
434 |
|
|
into an esmith::DomainsDB object. [msoulier 9803] |
435 |
|
|
|
436 |
|
|
* Mon Aug 25 2003 Michael Soulier <msoulier@e-smith.com> |
437 |
|
|
- [1.0.0-03] |
438 |
|
|
- Added a reference to the domains db in the extra data for processing the |
439 |
|
|
VirtualHosts fragments. [msoulier 9803] |
440 |
|
|
|
441 |
|
|
* Fri Aug 1 2003 Michael Soulier <msoulier@e-smith.com> |
442 |
|
|
- [1.0.0-02] |
443 |
|
|
- Fixed a precedence error that broke virtual hosts in apache. |
444 |
|
|
[msoulier 9640] |
445 |
|
|
|
446 |
|
|
* Wed Jul 9 2003 Charlie Brady <charlieb@e-smith.com> |
447 |
|
|
- [1.0.0-01] |
448 |
|
|
- Setting to release version number - 1.0.0 |
449 |
|
|
|
450 |
|
|
* Wed Jul 9 2003 Michael Soulier <msoulier@e-smith.com> |
451 |
|
|
- [0.2.0-04] |
452 |
|
|
- Fixed breakage in admin web server when a local network with a 32-bit subnet |
453 |
|
|
mask is used. [msoulier 9259] |
454 |
|
|
|
455 |
|
|
* Thu Jul 3 2003 Charlie Brady <charlieb@e-smith.com> |
456 |
|
|
- [0.2.0-03] |
457 |
|
|
- Fix log noise problem in expansion of httpd.conf template. [charlieb 9269] |
458 |
|
|
|
459 |
|
|
* Wed Jul 2 2003 Charlie Brady <charlieb@e-smith.com> |
460 |
|
|
- [0.2.0-02] |
461 |
|
|
- List primary domain as first (default) virtual domain in apache config. |
462 |
|
|
Include $SystemName.domain.name in ServerAlias directive. [charlieb 9241] |
463 |
|
|
|
464 |
|
|
* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com> |
465 |
|
|
- [0.2.0-01] |
466 |
|
|
- Changing version to stable stream number - 0.2.0 |
467 |
|
|
|
468 |
|
|
* Thu Jun 12 2003 Gordon Rowell <gordonr@e-smith.com> |
469 |
|
|
- [0.1.2-01] |
470 |
|
|
- Add order to migrate fragments [gordonr 9015] |
471 |
|
|
|
472 |
|
|
* Wed Jun 11 2003 Gordon Rowell <gordonr@e-smith.com> |
473 |
|
|
- [0.1.1-02] |
474 |
|
|
- Fixed Conflicts header - should be <, not <= [gordonr 8903] |
475 |
|
|
|
476 |
|
|
* Fri Jun 6 2003 Gordon Rowell <gordonr@e-smith.com> |
477 |
|
|
- [0.1.1-01] |
478 |
|
|
- Shuffled some httpd.conf fragments to e-smith-ibays [gordonr 8903] |
479 |
|
|
|
480 |
|
|
* Wed May 28 2003 Michael Soulier <msoulier@e-smith.com> |
481 |
|
|
- [0.1.0-19] |
482 |
|
|
- Moving httpd-e-smith init script to e-smith-apache. [msoulier 8852] |
483 |
|
|
|
484 |
|
|
* Tue Apr 29 2003 Gordon Rowell <gordonr@e-smith.com> |
485 |
|
|
- [0.1.0-18] |
486 |
|
|
- Do an explicit die if the httpd-e-smith record is missing from the |
487 |
|
|
config db, rather than an implicit die due to an invalid object |
488 |
|
|
reference [gordonr 8609] |
489 |
|
|
|
490 |
|
|
* Wed Apr 9 2003 Gordon Rowell <gordonr@e-smith.com> |
491 |
|
|
- [0.1.0-17] |
492 |
|
|
- Relocated conf-httpd from e-smith-base [gordonr 8150] |
493 |
|
|
|
494 |
|
|
* Fri Apr 4 2003 Mark Knox <markk@e-smith.com> |
495 |
|
|
- [0.1.0-16] |
496 |
|
|
- Moved restart-httpd-* actions from base [markk 5509] |
497 |
|
|
|
498 |
|
|
* Fri Apr 4 2003 Mark Knox <markk@e-smith.com> |
499 |
|
|
- [0.1.0-15] |
500 |
|
|
- Moved db config fragments here from e-smith-base [markk 5509] |
501 |
|
|
|
502 |
|
|
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com> |
503 |
|
|
- [0.1.0-14] |
504 |
|
|
- Make /server-resources/ browsable from LAN [gordonr 6620] |
505 |
|
|
|
506 |
|
|
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com> |
507 |
|
|
- [0.1.0-13] |
508 |
|
|
- Delete Apache ReadmeName directive [gordonr 6313] |
509 |
|
|
|
510 |
|
|
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com> |
511 |
|
|
- [0.1.0-12] |
512 |
|
|
- Fixed broken conf-httpd-e-smith links in post-{install,upgrade} [gordonr 7960] |
513 |
|
|
|
514 |
|
|
* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com> |
515 |
|
|
- [0.1.0-11] |
516 |
|
|
- Deleted ./etc/httpd/conf/httpd.conf/template-begin |
517 |
|
|
deleted ./etc/httpd/conf/srm.conf/template-begin |
518 |
|
|
deleted ./etc/httpd/conf/access.conf/template-begin [lijied 3295] |
519 |
|
|
|
520 |
|
|
* Mon Mar 17 2003 Lijie Deng <lijied@e-smith.com> |
521 |
|
|
- [0.1.0-10] |
522 |
|
|
- Delete empty template-end file [lijied 3295] |
523 |
|
|
|
524 |
|
|
* Wed Mar 12 2003 Charlie Brady <charlieb@e-smith.com> |
525 |
|
|
- [0.1.0-09] |
526 |
|
|
- Remove more references to primary and wwwpublic in favour |
527 |
|
|
of the "Primary" i-bay. There is still some special case code, |
528 |
|
|
which might go later if it turns out not to be needed. |
529 |
|
|
[charlieb 5652] |
530 |
|
|
|
531 |
|
|
* Tue Mar 11 2003 Mark Knox <markk@e-smith.com> |
532 |
|
|
- [0.1.0-08] |
533 |
|
|
- Fixed a missing quote in 27ManagerProxyPass [markk 7635] |
534 |
|
|
|
535 |
|
|
* Tue Mar 11 2003 Gordon Rowell <gordonr@e-smith.com> |
536 |
|
|
- [0.1.0-07] |
537 |
|
|
- Pass externalSSLAccess and localAccess to VirtualDomains fragments so they don't |
538 |
|
|
need to recalculate these values [gordonr 7635] |
539 |
|
|
- Use early return from 27ManagerProxyPass and new DB interface [gordonr 7635] |
540 |
|
|
|
541 |
|
|
* Mon Mar 10 2003 Charlie Brady <charlieb@e-smith.com> |
542 |
|
|
- [0.1.0-06] |
543 |
|
|
- Remove special case handling for /home/e-smith/files/primary in Apache |
544 |
|
|
configuration. Migrate code and db entries for wwwpublic to Public. |
545 |
|
|
[charlieb 5652] |
546 |
|
|
|
547 |
|
|
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com> |
548 |
|
|
- [0.1.0-05] |
549 |
|
|
- Replace deprecated CONFREF with MORE_DATA in processTemplate call in |
550 |
|
|
VirtualHosts fragment of httpd.conf templates. Fixes template |
551 |
|
|
expansion breakage (I'm not sure what broke it, but this fixes it.) |
552 |
|
|
[charlieb] |
553 |
|
|
- Add default config db fragments to set type and status. Remove redundant |
554 |
|
|
conf-httpd-e-smith script. [charlieb 1507] |
555 |
|
|
|
556 |
|
|
* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com> |
557 |
|
|
- [0.1.0-04] |
558 |
|
|
- Move SSL initialisation to global context [gordonr 1432] |
559 |
|
|
|
560 |
|
|
* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com> |
561 |
|
|
- [0.1.0-03] |
562 |
|
|
- Use default SSL certificate of $SystemName.$DomainName [gordonr 4874] |
563 |
|
|
|
564 |
|
|
* Wed Jan 8 2003 Mark Knox <markk@e-smith.com> |
565 |
|
|
- [0.1.0-02] |
566 |
|
|
- Added conf-httpd-e-smith action linked to the same events as conf-startup |
567 |
|
|
in e-smith-base [markk 6428] |
568 |
|
|
|
569 |
|
|
* Mon Jan 06 2003 Mark Knox <m_knox@mitel.com> |
570 |
|
|
- [0.1.0-01] |
571 |
|
|
- Initial release, split out from e-smith-base [markk 6428] |
572 |
|
|
|
573 |
|
|
%prep |
574 |
|
|
%setup |
575 |
snetram |
1.5 |
%patch0 -p1 |
576 |
snetram |
1.7 |
%patch1 -p1 |
577 |
|
|
%patch2 -p1 |
578 |
snetram |
1.9 |
%patch3 -p1 |
579 |
snetram |
1.10 |
%patch4 -p1 |
580 |
snetram |
1.12 |
%patch5 -p1 |
581 |
snetram |
1.13 |
%patch6 -p1 |
582 |
wellsi |
1.14 |
%patch7 -p1 |
583 |
mrjhb3 |
1.15 |
%patch8 -p1 |
584 |
wellsi |
1.17 |
%patch9 -p1 |
585 |
vip-ire |
1.21 |
%patch10 -p1 |
586 |
slords |
1.1 |
|
587 |
|
|
%pre |
588 |
|
|
|
589 |
|
|
%post |
590 |
|
|
|
591 |
|
|
%build |
592 |
|
|
perl createlinks |
593 |
|
|
mkdir -p root/service |
594 |
|
|
ln -s /var/service/httpd-e-smith root/service/httpd-e-smith |
595 |
|
|
mkdir -p root/var/service/httpd-e-smith/supervise |
596 |
|
|
touch root/var/service/httpd-e-smith/down |
597 |
|
|
|
598 |
|
|
mkdir -p root/etc/httpd |
599 |
|
|
mkdir -p root/var/state/httpd |
600 |
|
|
ln -s ../../var/state/httpd root/etc/httpd/state |
601 |
|
|
|
602 |
|
|
%install |
603 |
|
|
rm -rf $RPM_BUILD_ROOT |
604 |
|
|
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
605 |
|
|
|
606 |
|
|
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
607 |
|
|
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
608 |
|
|
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
609 |
|
|
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
610 |
|
|
> e-smith-%{version}-filelist |
611 |
|
|
|
612 |
|
|
echo "%doc COPYING" >> e-smith-%{version}-filelist |
613 |
|
|
|
614 |
|
|
%clean |
615 |
|
|
rm -rf $RPM_BUILD_ROOT |
616 |
|
|
|
617 |
|
|
%files -f e-smith-%{version}-filelist |
618 |
|
|
%defattr(-,root,root) |