initial commit of file from CVS for e-smith-apache on Wed 12 Jul 08:48:55 BST 2023

This commit is contained in:
Brian Read 2023-07-12 08:48:55 +01:00
parent 59a683f749
commit 9a57a15f5f
177 changed files with 2648 additions and 2 deletions

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
*.rpm
*.log
*spec-20*
*.tar.xz

21
Makefile Normal file
View File

@ -0,0 +1,21 @@
# Makefile for source rpm: e-smith-apache
# $Id: Makefile,v 1.1 2016/02/04 18:31:19 vip-ire Exp $
NAME := e-smith-apache
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View File

@ -1,3 +1,17 @@
# e-smith-apache # <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> e-smith-apache
SMEServer Koozali developed git repo for e-smith-apache smeserver SMEServer Koozali developed git repo for e-smith-apache smeserver
## Wiki
<br />https://wiki.koozali.org/
## Bugzilla
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-apache&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
## Description
<br />*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.*
*Once it has been checked, then this comment will be deleted*
<br />
E-smith-apache is a free, open source web server software designed to provide a secure, stable and reliable platform for web hosting. It is a product of the E-Smith company and is built on the Apache web server platform, providing a user friendly interface and additional features such as support for multiple web servers, a graphical interface for creating virtual hosts, and integrated scripting and database support. With its simplicity and robust security features, E-smith-apache makes it an ideal choice for businesses and individuals looking for a reliable and secure web server solution.

340
additional/COPYING Normal file
View File

@ -0,0 +1,340 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

321
additional/e-smith-apache.spec Executable file
View File

@ -0,0 +1,321 @@
Summary: e-smith server and gateway - apache module
%define name e-smith-apache
Name: %{name}
%define version 1.1.2
%define release 01
Version: %{version}
Release: %{release}
License: GPL
Vendor: Mitel Networks Corporation
Group: Networking/Daemons
Source: %{name}-%{version}.tar.gz
Packager: e-smith developers <bugs@e-smith.com>
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildArchitectures: noarch
Requires: e-smith-base >= 4.15.1
Requires: e-smith-daemontools >= 1.7.1-01
Conflicts: e-smith-ibays < 1.0.2
AutoReqProv: no
BuildRequires: e-smith-devtools >= 1.11.0-12
%description
e-smith server and gateway software - apache module.
%changelog
* Wed Nov 17 2004 Mark Knox <markk@e-smith.com>
- [1.1.2-01]
- Picking up new directory. MN00056429.
* Wed Nov 17 2004 Mark Knox <markk@e-smith.com>
- [1.1.1-03]
- Added empty ValidFrom defaults fragment [markk MN00056429]
* Tue Nov 9 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.1-02]
- Modify config and run script for compatibility with apache 2. Most of these
changes were contributed by Shad Lords. [charlieb MN00051144]
* Mon Oct 4 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.1-01]
- New development stream for apache 2 - 1.1.1
* Fri Sep 3 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-23]
- Clean BuildRequires. [charlieb MN00043055]
* Tue Jul 13 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-22]
- Updated modPerl templates to remove use of esmith::config.
[msoulier MN00039579]
* Tue Jun 22 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-21]
- Added RewriteCond statements to previous RewriteRules to exclude localhost,
so ssh port-forwarding is not broken. [msoulier MN00020885]
* Fri Jun 18 2004 Tony Clayton <apc@e-smith.com>
- [1.1.0-20]
- Fix LoadModule fragment from last patch [tonyc 11348]
* Mon Jun 14 2004 Tony Clayton <apc@e-smith.com>
- [1.1.0-19]
- Add modPerl service and httpd.conf templates [tonyc 11348]
* Mon May 10 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-18]
- Adding rewrite rules to prevent plaintext access to the server manager.
[msoulier MN00020885]
* Thu May 6 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-17]
- Added httpd-admin's remoteaccess list to permissible networks for
server-resources. [msoulier MN00024949]
* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-16]
- Backing-out last change. [msoulier dpar-21489]
* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-15]
- Added restart-httpd-graceful to domain-* events. [msoulier dpar-21489]
* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-14]
- Updating requires to e-smith-daemontools. [msoulier 7629]
* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-13]
- Updating restart-httpd-graceful to use new daemontools sigusr1 option.
[msoulier 7629]
* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-12]
- Staggering the symlinks a little farther. [msoulier 9955]
* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-11]
- Adding symlinks to the service-domain-create event for httpd restart.
[msoulier 9955]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-10]
- Fixed another error in the specfile, resulting in incorrect file
permissions. [msoulier 7629]
- Updated action scripts for supervise. [msoulier 7629]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-09]
- Fixed an error in the specfile. [msoulier 7629]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-08]
- Updated createlinks for daemontools. [msoulier 7629]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-07]
- Putting httpd-e-smith under supervision. [msoulier 7629]
* Thu Sep 18 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-06]
- Added a null-string return value to the end of 00Setup, ensure no output
from that fragment. [msoulier 9803]
* Wed Sep 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-05]
- Use implementation class, not virtual class in VirtualHosts/00Setup fragment.
[charlieb 9803]
* Wed Sep 3 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-04]
- Added a 75AddType05.exe fragment to specify a proper mime-type for .exe
files. [msoulier 9866]
* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-03]
- Allow TemplatePath property in domain record to specify an alternate template
subdir for virtual host content specification (e.g. to proxypass a domain).
[charlieb 8409]
* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-02]
- Changed the VirtualHosts subtemplate to pass the domain object instead of db handle,
and modified VirtualHosts/00Setup fragment to convert it to the right class.
Fix scoping problem with the blessed object. [charlieb 9803]
* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-01]
- rolling to dev stream - 1.1.0
* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com>
- [1.0.0-04]
- Added a 00Setup fragment to VirtualHosts to process the %domainsdb hash back
into an esmith::DomainsDB object. [msoulier 9803]
* Mon Aug 25 2003 Michael Soulier <msoulier@e-smith.com>
- [1.0.0-03]
- Added a reference to the domains db in the extra data for processing the
VirtualHosts fragments. [msoulier 9803]
* Fri Aug 1 2003 Michael Soulier <msoulier@e-smith.com>
- [1.0.0-02]
- Fixed a precedence error that broke virtual hosts in apache.
[msoulier 9640]
* Wed Jul 9 2003 Charlie Brady <charlieb@e-smith.com>
- [1.0.0-01]
- Setting to release version number - 1.0.0
* Wed Jul 9 2003 Michael Soulier <msoulier@e-smith.com>
- [0.2.0-04]
- Fixed breakage in admin web server when a local network with a 32-bit subnet
mask is used. [msoulier 9259]
* Thu Jul 3 2003 Charlie Brady <charlieb@e-smith.com>
- [0.2.0-03]
- Fix log noise problem in expansion of httpd.conf template. [charlieb 9269]
* Wed Jul 2 2003 Charlie Brady <charlieb@e-smith.com>
- [0.2.0-02]
- List primary domain as first (default) virtual domain in apache config.
Include $SystemName.domain.name in ServerAlias directive. [charlieb 9241]
* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com>
- [0.2.0-01]
- Changing version to stable stream number - 0.2.0
* Thu Jun 12 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.2-01]
- Add order to migrate fragments [gordonr 9015]
* Wed Jun 11 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.1-02]
- Fixed Conflicts header - should be <, not <= [gordonr 8903]
* Fri Jun 6 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.1-01]
- Shuffled some httpd.conf fragments to e-smith-ibays [gordonr 8903]
* Wed May 28 2003 Michael Soulier <msoulier@e-smith.com>
- [0.1.0-19]
- Moving httpd-e-smith init script to e-smith-apache. [msoulier 8852]
* Tue Apr 29 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-18]
- Do an explicit die if the httpd-e-smith record is missing from the
config db, rather than an implicit die due to an invalid object
reference [gordonr 8609]
* Wed Apr 9 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-17]
- Relocated conf-httpd from e-smith-base [gordonr 8150]
* Fri Apr 4 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-16]
- Moved restart-httpd-* actions from base [markk 5509]
* Fri Apr 4 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-15]
- Moved db config fragments here from e-smith-base [markk 5509]
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-14]
- Make /server-resources/ browsable from LAN [gordonr 6620]
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-13]
- Delete Apache ReadmeName directive [gordonr 6313]
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-12]
- Fixed broken conf-httpd-e-smith links in post-{install,upgrade} [gordonr 7960]
* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com>
- [0.1.0-11]
- Deleted ./etc/httpd/conf/httpd.conf/template-begin
deleted ./etc/httpd/conf/srm.conf/template-begin
deleted ./etc/httpd/conf/access.conf/template-begin [lijied 3295]
* Mon Mar 17 2003 Lijie Deng <lijied@e-smith.com>
- [0.1.0-10]
- Delete empty template-end file [lijied 3295]
* Wed Mar 12 2003 Charlie Brady <charlieb@e-smith.com>
- [0.1.0-09]
- Remove more references to primary and wwwpublic in favour
of the "Primary" i-bay. There is still some special case code,
which might go later if it turns out not to be needed.
[charlieb 5652]
* Tue Mar 11 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-08]
- Fixed a missing quote in 27ManagerProxyPass [markk 7635]
* Tue Mar 11 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-07]
- Pass externalSSLAccess and localAccess to VirtualDomains fragments so they don't
need to recalculate these values [gordonr 7635]
- Use early return from 27ManagerProxyPass and new DB interface [gordonr 7635]
* Mon Mar 10 2003 Charlie Brady <charlieb@e-smith.com>
- [0.1.0-06]
- Remove special case handling for /home/e-smith/files/primary in Apache
configuration. Migrate code and db entries for wwwpublic to Public.
[charlieb 5652]
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com>
- [0.1.0-05]
- Replace deprecated CONFREF with MORE_DATA in processTemplate call in
VirtualHosts fragment of httpd.conf templates. Fixes template
expansion breakage (I'm not sure what broke it, but this fixes it.)
[charlieb]
- Add default config db fragments to set type and status. Remove redundant
conf-httpd-e-smith script. [charlieb 1507]
* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-04]
- Move SSL initialisation to global context [gordonr 1432]
* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-03]
- Use default SSL certificate of $SystemName.$DomainName [gordonr 4874]
* Wed Jan 8 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-02]
- Added conf-httpd-e-smith action linked to the same events as conf-startup
in e-smith-base [markk 6428]
* Mon Jan 06 2003 Mark Knox <m_knox@mitel.com>
- [0.1.0-01]
- Initial release, split out from e-smith-base [markk 6428]
%prep
%setup
%pre
%post
%build
perl createlinks
mkdir -p root/service
ln -s /var/service/httpd-e-smith root/service/httpd-e-smith
mkdir -p root/var/service/httpd-e-smith/supervise
touch root/var/service/httpd-e-smith/down
%install
rm -rf $RPM_BUILD_ROOT
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
> e-smith-%{version}-filelist
echo "%doc COPYING" >> e-smith-%{version}-filelist
%clean
rm -rf $RPM_BUILD_ROOT
%files -f e-smith-%{version}-filelist
%defattr(-,root,root)

1
contriborbase Normal file
View File

@ -0,0 +1 @@
sme10

187
createlinks Executable file
View File

@ -0,0 +1,187 @@
#!/usr/bin/perl -w
use esmith::Build::CreateLinks qw(:all);
#--------------------------------------------------
# actions for e-smith-apache-update
#--------------------------------------------------
my $event = "e-smith-apache-update";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
event_link("systemd-reload", $event, "89");
event_link("systemd-default", $event, "88");
templates2events("/etc/logrotate.d/httpd", $event);
#--------------------------------------------------
# actions for console-save event
#--------------------------------------------------
my $event = "console-save";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for bootstrap-console-save event
#--------------------------------------------------
$event = "bootstrap-console-save";
templates2events("/etc/httpd/conf/httpd.conf", $event);
templates2events("/etc/logrotate.d/httpd", $event);
#--------------------------------------------------
# actions for domain-create event
#--------------------------------------------------
$event = "domain-create";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for domain-delete event
#--------------------------------------------------
$event = "domain-delete";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for domain-modify event
#--------------------------------------------------
$event = "domain-modify";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for host-create event
#--------------------------------------------------
$event = "host-create";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for host-delete event
#--------------------------------------------------
$event = "host-delete";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for host-modify event
#--------------------------------------------------
$event = "host-modify";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for ibay-create event
#--------------------------------------------------
$event = "ibay-create";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for ibay-delete event
#--------------------------------------------------
$event = "ibay-delete";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for ibay-modify event
# (used after changing parameters for a single i-bay)
#--------------------------------------------------
$event = "ibay-modify";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for ibay-modify-servers event
# (used after changing the group of several i-bays in sequence)
#--------------------------------------------------
$event = "ibay-modify-servers";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for network-create event
#--------------------------------------------------
$event = "network-create";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for network-delete event
#--------------------------------------------------
$event = "network-delete";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for remoteaccess-update event
#--------------------------------------------------
$event = "remoteaccess-update";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for email-update event
#--------------------------------------------------
$event = "email-update";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for logrotate event
#--------------------------------------------------
$event = "logrotate";
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for ssl-update event
#--------------------------------------------------
$event = "ssl-update";
templates2events("/etc/httpd/conf/httpd.conf", $event);
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#--------------------------------------------------
# actions for post-install event
#--------------------------------------------------
$event = "post-install";
templates2events("/etc/logrotate.d/httpd", $event);
#--------------------------------------------------
# actions for post-upgrade event
#--------------------------------------------------
$event = "post-upgrade";
templates2events("/etc/logrotate.d/httpd", $event);

711
e-smith-apache.spec Normal file
View File

@ -0,0 +1,711 @@
# $Id: e-smith-apache.spec,v 1.27 2022/10/07 09:04:44 terryfage Exp $
Summary: e-smith server and gateway - apache module
%define name e-smith-apache
Name: %{name}
%define version 2.6.0
%define release 24
Version: %{version}
Release: %{release}%{?dist}
License: GPL
Group: Networking/Daemons
Source: %{name}-%{version}.tar.xz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildArchitectures: noarch
Requires: e-smith-base >= 4.15.1
Requires: e-smith-lib >= 1.15.1-19
Requires: e-smith-daemontools >= 1.7.1-01
Requires: mod_ssl
Requires: mod_authnz_external
Obsoletes: distcache <= 1.4.5
Obsoletes: mod_auth_external
Obsoletes: e-smith-proxypass
Obsoletes: e-smith-apache-proxy
# for the new httpd 2.4 syntax
Conflicts: e-smith-ibays < 2.6.0-19
Conflicts: smeserver-horde < 1.0.0-32
Conflicts: smeserver-php < 3.0.0-43
Conflicts: e-smith-proxy < 5.6.0-11
Conflicts: e-smith-manager < 2.8.0-36
AutoReqProv: no
BuildRequires: e-smith-devtools >= 1.11.0-12
%description
e-smith server and gateway software - apache module.
%prep
%setup
rm -rf root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith
%build
perl createlinks
%install
rm -rf $RPM_BUILD_ROOT
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
--file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
> e-smith-%{version}-filelist
echo "%doc COPYING" >> e-smith-%{version}-filelist
%clean
rm -rf $RPM_BUILD_ROOT
%files -f e-smith-%{version}-filelist
%defattr(-,root,root)
%pre
# ease the transition between runit and systemd
if [ $1 -gt 1 ] ; then
if [ -e /var/service/httpd-e-smith/run ] ; then
/usr/bin/sv d httpd-e-smith
fi
fi
%changelog
* Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-24.sme
- Roll up patches and move to git repo [SME: 12338]
* Wed Jul 12 2023 BogusDateBot
- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
by assuming the date is correct and changing the weekday.
* Fri Oct 07 2022 Zsolt Vasarhely <vasarhelyizsolt@hotmail.com> 2.6.0-23.sme
- Running reconfigure from server-manager hangs at S07rotate_logfiles [SME: 12207]
* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-22.sme
- reverting last change [SME: 9375]
- add conflict on older ibays, php, horde, proxy, manager rpms
* Sun Jul 24 2022 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-20.sme
- removing mod_access_compat [SME: 9375]
* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme
- convert httpd 2.2 allow,deny to Require for 2.4 [SME: 9375]
- use maxsize, not size [SME: 11867]
* Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-18.sme
- use logrotate.d instead of event action [SME: 11867]
use size to force log rotate before normal delay
* Mon Nov 15 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-16.sme
- add modules ldap authnz_ldap and proxy_wstunnel [SME: 11760]
previously provided by webapps-common
* Thu Sep 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-15.sme
- fix httpd-e-smith failing to start on reboot in private server-gateway mode [SME: 11596]
* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-14.sme
- add possibility to force https on LAN only [SME: 11511]
usefull for VPN over port 443
* Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
- prevent httpd to fail if modSSL defined certs does not exist [SME: 10826]
default on self generated cert
* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
- create-update event [SME: 11123]
- move httpd-e-smith to systemd [SME: 11111]
changed sigusr1 used in events to reload as defined in the unit file
- give a logger to httpd-e-smith : journald [SME: 1416]
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
- set default SSLStrictSNIVHostCheck to off [SME: 8693]
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
- add SNI support for individual certificates per VirtualHosts [SME: 8693]
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
- port 80 and 443 should not be hardcoded [SME: 9192]
- e-smith-apache removing hardcoded ports [SME: 10966]
* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
- remove php3 and php4 refs [SME: 10867]
* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
- disable TLSv1 TLSv1.1 by default [SME: 10459]
* put strong ciphers first in default string
* cipher order and properties with periods
* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
- add SSLHonorCipherOrder Directive [SME: 10916]
* Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
- update apache icon path [SME: 9591]
* Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
- fix syntax preventing httpd to launch [SME: 9364]
- moved changelog at end of file
* Thu Feb 4 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-1.sme
- Roll new stream for sme10
* Sun Jan 17 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-15.sme
- Hook into the new ssl-update event [SME: 9152]
* Thu Jan 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-14.sme
- Set TLSv1 back to enabled (but keep a prop to disable it if needed) [SME: 9154]
* Wed Jan 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-13.sme
- Disable TLSv1 [SME: 9154]
* Tue Dec 9 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-12.sme
- Disable SSLv3 [SME: 8722]
* Fri Oct 31 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-11.sme
- Revert CRIME mitigation patch, as it's not needed [SME: 8613]
* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-10.sme
- Mitigate CVE-2012-4929 [SME: 8613]
* Tue Jul 29 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-9.sme
- Turn SSLEngine on in the SSL vhost (ProxyPassVirtualHosts) [SME: 8501]
* Tue Jan 28 2014 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
- Remove insecure ciphers [SME: 8138]
* Mon Oct 07 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.4.0-7.sme
- Re-do patch to add missing default httpd.conf modules [SME: 7874]
- Add authz_groupfile as a loadable Module [SME: 7875]
* Fri Oct 04 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.4.0-6.sme
- Patch to add missing default httpd.conf modules [SME: 7874]
* Mon Sep 30 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.4.0-5.sme
- Patch to correct issue with not being able to access a password protected ibay [SME: 7794]
* Mon Mar 11 2013 Shad L. Lords <slords@mail.com> 2.4.0-4.sme
- Obsolete el5 version of distcache [SME: 7273]
* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-3.sme
- Obsolete mod_auth_external and require mod_authnz_external [SME: 7319]
- Change the way module is loaded and initialized
* Mon Feb 18 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2.sme
- Add missing dependency on mod_ssl [SME: 7234]
* Wed Feb 13 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
- Roll new stream for sme9
* Fri Jun 29 2012 Ian Wells <esmith@wellsi.com> 2.2.0-9.sme
- Disable index listing of Apache icons folder [SME: 7015]
* Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme
- Fix server-resources redirect w/o trailing slash [SME: 6758]
* Sat Mar 12 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-7.sme
- Disable SSLv2 by default [SME: 6482]
* Sun Apr 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
- Add option to disable SSLv2 [SME: 5034]
* Sat Mar 28 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
- Add OpenOffice2 MIME Types [SME: 5112]
* Sat Mar 7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
- Add OpenOffice MIME Types [SME: 4848]
- Add XML MIME Type [SME: 5035]
* Thu Dec 11 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-3.sme
- Fix issues in patch that adds Microsoft Office 2007 MIME types [SME: 4548]
* Tue Dec 2 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
- Add Microsoft Office 2007 MIME types [SME: 4548]
* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
- Roll new stream to separate sme7/sme8 trees [SME: 4633]
* Tue Oct 23 2007 Filippo Carletti <filippo.carletti@gmail.com> 1.2.0-16
- Add SSL support to ProxyPass. [SME: 3481]
* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-15
- Create/Move httpd logrotate.d directory. [SME: 3380]
* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-14
- Rename apache to httpd in templates2expand. [SME: 3380]
* Wed Jun 6 2007 Shad L. Lords <slords@mail.com> 1.2.0-13
- Fix patch to exclude hosts if domains exist [SME: 2307]
* Fri May 18 2007 Shad L. Lords <slords@mail.com> 1.2.0-12
- Use correct lib for modules
* Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
- Clean up spec so package can be built by koji/plague
* Fri Feb 23 2007 Shad L. Lords <slords@mail.com> 1.2.0-11
- Fix patch so template expands [SME: 2307]
* Fri Feb 23 2007 Shad L. Lords <slords@mail.com> 1.2.0-10
- Don't include host if domain exists [SME: 2307]
* Tue Feb 13 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.0-9
- Gracefully handle differences in module names between apache
versions. [SME: 2471]
- Add logrotate changes which should have been in 1.2.0-7 (patch
was provided but not applied).
* Sat Jan 27 2007 Shad L. Lords <slords@mail.com> 1.2.0-8
- Remove proxypass fragment (now in e-smith-manager)
* Sat Jan 27 2007 Shad L. Lords <slords@mail.com> 1.2.0-8
- Remove proxypass fragment (now in e-smith-manager)
* Fri Jan 19 2007 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-7
- Move logrotate fragments from e-smith-base.
* Thu Dec 21 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-6
- Add support for optional modSSL{CertificateChainFile} [SME: 1779]
* Thu Dec 07 2006 Shad L. Lords <slords@mail.com>
- Update to new release naming. No functional changes.
- Make Packager generic
* Wed Nov 29 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-04
- Revert last change [SME: 2109]
- TODO: Split dev stream for that change
- Add Conflicts for latest e-smith-manager dev stream
* Wed Nov 08 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-03
- Remove manager proxy pass fragment - moved to e-smith-manager.
* Sat Jul 15 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-02
- Add ProxyPassReverse directives to allow redirects to work for proxy-
passed virtual domains. Also proxy pass https to https. [SME: 1735]
* Tue Mar 14 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-01
- Roll stable stream version. [SME: 1016]
* Mon Mar 13 2006 Charlie Brady <charlie_brady@mitel.com> 1.1.2-37
- Fix lookup of 'httpd' props in a few templates. Service name is
httpd-e-smith. [SME: 1029]
* Fri Feb 10 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-36
- Deny access to files starting with .ht typically
.htaccess and .htpasswd [SME: 716]
* Tue Jan 31 2006 Gavin Weight <gweight@gmail.com> 1.1.2-35
- Change modPerl from enabled to disabled [SME: 575]
* Fri Jan 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-34
- Add SVG filetype [SME: 374]
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-33
- And relocate the modSSL{CipherSuite} default to e-smith-base with
the other modSSL defaults [SME: 194]
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-32
- Change default CipherSuite [SME: 194]
Was: ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:-LOW:+SSLv2:-EXP
Is: ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-31
- Moved SSL CipherSuite into db default - modSSL{CipherSuite} [SME: 194]
* Thu Dec 15 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-30
- Remove inode from FileETag response [SME: 198]
* Wed Dec 14 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-29
- Use literal HERE document to ensure braces in TRACE/TRACK rewrite [SME: 196]
* Wed Dec 14 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-28
- Add type for XSL stylesheet (.xsl) files [SME: 76]
* Wed Nov 30 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-27
- Bump release number only
* Wed Aug 17 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-26]
- Add content from e-smith-apache-proxy, to enable apache to
also operate as a non-caching proxy server. Add Obsoletes:
header to ensure e-smith-apache-proxy RPM is removed on
upgrade.
* Tue Aug 9 2005 Shad Lords <slords@mail.com>
- [1.1.2-25]
- Add directive for icons directory
- Fix newlines left on end of icons template
- Update server aliases to reference all local hosts [SF: 1246172]
* Wed Aug 3 2005 Shad Lords <slords@mail.com>
- [1.1.2-24]
- Fix Rewrite rule to include trailing stuff
* Wed Aug 3 2005 Shad Lords <slords@mail.com>
- [1.1.2-23]
- Update ProxyPass to use httpd-admin{TCPPort} [SF: 1246986]
* Wed Jul 27 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-22]
- Disable HTTP TRACK and TRACE in each VirtualDomain (patch by Gordon
Rowell, with some further work by Shad Lords). [SF: 1240658]
* Wed Jul 27 2005 Gordon Rowell <gordonr@gormand.com.au>
- [1.1.2-21]
- Disable all low grade ciphers for SSL. [SF: 1240654]
* Tue Jul 19 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-20]
- Don't load userdir module by default. It's not used, and causes
Nessus to complain. [SF: 1240657]
* Mon Jul 18 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-19]
- Patch from Shad: update rewrite and ProxyPass stuff for manager URLs.
[SF: 1172203]
* Mon Jul 18 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-18]
- Add GPL COPYING file.
* Mon Jul 18 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-17]
- Clean up apache templates to use current DB interfaces.
- Make sure the single host ValidFrom specs for proxypass doesn't
upset apache.
* Tue Jun 21 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-16]
- Make sure that DocumentRoot directory exists - latest apache2
will not start up if not.
* Fri Jun 17 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-15]
- Do graceful restart of apache in domain-*, in case domain->ibay
assignments have changed. [SF: 1222433]
* Wed Jun 8 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-14]
- Add rewrite fragment for httpd.conf to disable TRACE and TRACK
requests.
* Fri May 27 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-13]
- Add support for TemplatePath => ProxyPassVirtualHost entries
in domains db.
* Fri May 27 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-12]
- Bring ProxyPass fragment up to latest e-smith-lib APIs.
* Fri May 27 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-11]
- Remove ProxyPass support for various deprecated URIs. [SF: 1172203]
- Add content of e-smith-proxypass RPM. Add Obsoletes: header.
* Wed Mar 30 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-10]
- Add default TCPPort property to httpd-e-smith, so that correct
hole is punched in firewall.
* Mon Mar 21 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-09]
- Remove mangling of syslog and apache log filenames - just
retargeting the symlinks has the same effect. [MN00064132]
* Sun Mar 20 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-08]
- Remove logrotate-httpd which is obsoleted by generic_template_expand.
* Wed Mar 16 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-07]
- Fix dangling symlink in ibay-create. [MN00065576]
* Mon Mar 14 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-06]
- Use generic_template_expand action where possible, in place
of specific actions. Update e-smith-lib dependency. [MN00064130]
- Replace all restart-* and most reload-* actions with calls to 'adjust-services'.
Update e-smith-lib version dependency. [MN00065576]
* Tue Feb 22 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-05]
- Don't attempt to configure httpd.conf in post-install and post-upgrade.
[MN00065717]
* Tue Jan 25 2005 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-04]
- Remove stray ServiceLink sylinks. [MN00064757]
* Tue Dec 28 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-03]
- Add "chpst -P" to httpd-e-smith run script, to protect runsv/supervise
from term signals (wrongly) relayed by apache. [charlieb MN00051144]
* Fri Dec 24 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.2-02]
- Remove ValidFrom defaults fragment for httpd-admin - as it duplicates
one in e-smith-base. [MN00062533]
* Wed Nov 17 2004 Mark Knox <markk@e-smith.com>
- [1.1.2-01]
- Picking up new directory. MN00056429.
* Wed Nov 17 2004 Mark Knox <markk@e-smith.com>
- [1.1.1-03]
- Added empty ValidFrom defaults fragment [markk MN00056429]
* Tue Nov 9 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.1-02]
- Modify config and run script for compatibility with apache 2. Most of these
changes were contributed by Shad Lords. [charlieb MN00051144]
* Mon Oct 4 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.1-01]
- New development stream for apache 2 - 1.1.1
* Fri Sep 3 2004 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-23]
- Clean BuildRequires. [charlieb MN00043055]
* Tue Jul 13 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-22]
- Updated modPerl templates to remove use of esmith::config.
[msoulier MN00039579]
* Tue Jun 22 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-21]
- Added RewriteCond statements to previous RewriteRules to exclude localhost,
so ssh port-forwarding is not broken. [msoulier MN00020885]
* Fri Jun 18 2004 Tony Clayton <apc@e-smith.com>
- [1.1.0-20]
- Fix LoadModule fragment from last patch [tonyc 11348]
* Mon Jun 14 2004 Tony Clayton <apc@e-smith.com>
- [1.1.0-19]
- Add modPerl service and httpd.conf templates [tonyc 11348]
* Mon May 10 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-18]
- Adding rewrite rules to prevent plaintext access to the server manager.
[msoulier MN00020885]
* Thu May 6 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-17]
- Added httpd-admin's remoteaccess list to permissible networks for
server-resources. [msoulier MN00024949]
* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-16]
- Backing-out last change. [msoulier dpar-21489]
* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-15]
- Added restart-httpd-graceful to domain-* events. [msoulier dpar-21489]
* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-14]
- Updating requires to e-smith-daemontools. [msoulier 7629]
* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-13]
- Updating restart-httpd-graceful to use new daemontools sigusr1 option.
[msoulier 7629]
* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-12]
- Staggering the symlinks a little farther. [msoulier 9955]
* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-11]
- Adding symlinks to the service-domain-create event for httpd restart.
[msoulier 9955]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-10]
- Fixed another error in the specfile, resulting in incorrect file
permissions. [msoulier 7629]
- Updated action scripts for supervise. [msoulier 7629]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-09]
- Fixed an error in the specfile. [msoulier 7629]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-08]
- Updated createlinks for daemontools. [msoulier 7629]
* Tue Dec 9 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-07]
- Putting httpd-e-smith under supervision. [msoulier 7629]
* Thu Sep 18 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-06]
- Added a null-string return value to the end of 00Setup, ensure no output
from that fragment. [msoulier 9803]
* Wed Sep 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-05]
- Use implementation class, not virtual class in VirtualHosts/00Setup fragment.
[charlieb 9803]
* Wed Sep 3 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-04]
- Added a 75AddType05.exe fragment to specify a proper mime-type for .exe
files. [msoulier 9866]
* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-03]
- Allow TemplatePath property in domain record to specify an alternate template
subdir for virtual host content specification (e.g. to proxypass a domain).
[charlieb 8409]
* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-02]
- Changed the VirtualHosts subtemplate to pass the domain object instead of db handle,
and modified VirtualHosts/00Setup fragment to convert it to the right class.
Fix scoping problem with the blessed object. [charlieb 9803]
* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com>
- [1.1.0-01]
- rolling to dev stream - 1.1.0
* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com>
- [1.0.0-04]
- Added a 00Setup fragment to VirtualHosts to process the %domainsdb hash back
into an esmith::DomainsDB object. [msoulier 9803]
* Mon Aug 25 2003 Michael Soulier <msoulier@e-smith.com>
- [1.0.0-03]
- Added a reference to the domains db in the extra data for processing the
VirtualHosts fragments. [msoulier 9803]
* Fri Aug 1 2003 Michael Soulier <msoulier@e-smith.com>
- [1.0.0-02]
- Fixed a precedence error that broke virtual hosts in apache.
[msoulier 9640]
* Wed Jul 9 2003 Charlie Brady <charlieb@e-smith.com>
- [1.0.0-01]
- Setting to release version number - 1.0.0
* Wed Jul 9 2003 Michael Soulier <msoulier@e-smith.com>
- [0.2.0-04]
- Fixed breakage in admin web server when a local network with a 32-bit subnet
mask is used. [msoulier 9259]
* Thu Jul 3 2003 Charlie Brady <charlieb@e-smith.com>
- [0.2.0-03]
- Fix log noise problem in expansion of httpd.conf template. [charlieb 9269]
* Wed Jul 2 2003 Charlie Brady <charlieb@e-smith.com>
- [0.2.0-02]
- List primary domain as first (default) virtual domain in apache config.
Include $SystemName.domain.name in ServerAlias directive. [charlieb 9241]
* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com>
- [0.2.0-01]
- Changing version to stable stream number - 0.2.0
* Thu Jun 12 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.2-01]
- Add order to migrate fragments [gordonr 9015]
* Wed Jun 11 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.1-02]
- Fixed Conflicts header - should be <, not <= [gordonr 8903]
* Fri Jun 6 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.1-01]
- Shuffled some httpd.conf fragments to e-smith-ibays [gordonr 8903]
* Wed May 28 2003 Michael Soulier <msoulier@e-smith.com>
- [0.1.0-19]
- Moving httpd-e-smith init script to e-smith-apache. [msoulier 8852]
* Tue Apr 29 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-18]
- Do an explicit die if the httpd-e-smith record is missing from the
config db, rather than an implicit die due to an invalid object
reference [gordonr 8609]
* Wed Apr 9 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-17]
- Relocated conf-httpd from e-smith-base [gordonr 8150]
* Fri Apr 4 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-16]
- Moved restart-httpd-* actions from base [markk 5509]
* Fri Apr 4 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-15]
- Moved db config fragments here from e-smith-base [markk 5509]
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-14]
- Make /server-resources/ browsable from LAN [gordonr 6620]
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-13]
- Delete Apache ReadmeName directive [gordonr 6313]
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-12]
- Fixed broken conf-httpd-e-smith links in post-{install,upgrade} [gordonr 7960]
* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com>
- [0.1.0-11]
- Deleted ./etc/httpd/conf/httpd.conf/template-begin
deleted ./etc/httpd/conf/srm.conf/template-begin
deleted ./etc/httpd/conf/access.conf/template-begin [lijied 3295]
* Mon Mar 17 2003 Lijie Deng <lijied@e-smith.com>
- [0.1.0-10]
- Delete empty template-end file [lijied 3295]
* Wed Mar 12 2003 Charlie Brady <charlieb@e-smith.com>
- [0.1.0-09]
- Remove more references to primary and wwwpublic in favour
of the "Primary" i-bay. There is still some special case code,
which might go later if it turns out not to be needed.
[charlieb 5652]
* Tue Mar 11 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-08]
- Fixed a missing quote in 27ManagerProxyPass [markk 7635]
* Tue Mar 11 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-07]
- Pass externalSSLAccess and localAccess to VirtualDomains fragments so they don't
need to recalculate these values [gordonr 7635]
- Use early return from 27ManagerProxyPass and new DB interface [gordonr 7635]
* Mon Mar 10 2003 Charlie Brady <charlieb@e-smith.com>
- [0.1.0-06]
- Remove special case handling for /home/e-smith/files/primary in Apache
configuration. Migrate code and db entries for wwwpublic to Public.
[charlieb 5652]
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com>
- [0.1.0-05]
- Replace deprecated CONFREF with MORE_DATA in processTemplate call in
VirtualHosts fragment of httpd.conf templates. Fixes template
expansion breakage (I'm not sure what broke it, but this fixes it.)
[charlieb]
- Add default config db fragments to set type and status. Remove redundant
conf-httpd-e-smith script. [charlieb 1507]
* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-04]
- Move SSL initialisation to global context [gordonr 1432]
* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com>
- [0.1.0-03]
- Use default SSL certificate of $SystemName.$DomainName [gordonr 4874]
* Wed Jan 8 2003 Mark Knox <markk@e-smith.com>
- [0.1.0-02]
- Added conf-httpd-e-smith action linked to the same events as conf-startup
in e-smith-base [markk 6428]
* Mon Jan 06 2003 Mark Knox <m_knox@mitel.com>
- [0.1.0-01]
- Initial release, split out from e-smith-base [markk 6428]

View File

@ -0,0 +1 @@
disabled

View File

@ -0,0 +1 @@
disabled

View File

@ -0,0 +1 @@
80

View File

@ -0,0 +1 @@
public

View File

@ -0,0 +1 @@
enabled

View File

@ -0,0 +1 @@
service

View File

@ -0,0 +1 @@
disabled

View File

@ -0,0 +1 @@
service

View File

@ -0,0 +1,7 @@
{
# Deprecate 'wwwpublic' special case, and migrate to i-bay 'Primary'
foreach my $domain ($DB->get_all_by_prop('Content' => 'wwwpublic'))
{
$domain->merge_props('Content' => 'Primary');
}
}

View File

@ -0,0 +1,13 @@
{
#------------------------------------------------------------
# Compute "localAccess" string for use in template below.
#------------------------------------------------------------
use esmith::NetworksDB;
my $ndb = esmith::NetworksDB->open_ro();
$localAccess = $ndb->local_access_spec();
$localAccess =~ s#/255\.255\.255\.255##g;
"";
}

View File

@ -0,0 +1,17 @@
{
#---------------------------------------------------------------------
# Grab ValidFrom access list property of httpd-admin
# SSL enabled virtual hosts should only allow access from IP's in
# this list, as well as local networks.
#---------------------------------------------------------------------
$externalSSLAccess = '';
$OUT = '';
my $validFrom = ${'httpd-admin'}{'ValidFrom'};
return unless defined $validFrom;
$validFrom =~ s/,/ /g;
$validFrom =~ s:/255.255.255.255::g;
$externalSSLAccess = $validFrom;
}

View File

@ -0,0 +1,5 @@
{
$httpPort = ${'httpd-e-smith'}{TCPPort} || 80;
$httpsPort = $modSSL{TCCPort} || 443;
"";
}

View File

@ -0,0 +1,7 @@
# HostnameLookups: Log the names of clients or just their IP numbers
# e.g. www.apache.org (on) or 204.62.129.132 (off)
# The default is off because it'd be overall better for the net if people
# had to knowingly turn this feature on.
HostnameLookups { ${'httpd-e-smith'}{HostnameLookups} || 'off'; }

View File

@ -0,0 +1,5 @@
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
ServerAdmin admin@{ $DomainName }

View File

@ -0,0 +1,8 @@
# ServerRoot: The directory the server's config, error, and log files
# are kept in.
# NOTE! If you intend to place this on a NFS (or otherwise network)
# mounted filesystem then please read the LockFile documentation,
# you will save yourself a lot of trouble.
ServerRoot /etc/httpd

View File

@ -0,0 +1,2 @@
ServerTokens { ${'httpd-e-smith'}{ServerTokens} || 'ProductOnly'; }

View File

@ -0,0 +1,14 @@
# If you wish httpd to run as a different user or group, you must run
# httpd as root initially and it will switch.
# User/Group: The name (or #number) of the user/group to run httpd as.
# On SCO (ODT 3) use User nouser and Group nogroup
# On HPUX you may not be able to use shared memory as nobody, and the
# suggested workaround is to create a user www and use that user.
# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
# when the value of (unsigned)Group is above 60000;
# don't use Group nobody on these systems!
User www
Group www

View File

@ -0,0 +1,11 @@
# ErrorLog: The location of the error log file. If this does not start
# with /, ServerRoot is prepended to it.
ErrorLog /var/log/httpd/error_log
# LogLevel: Control the number of messages logged to the error_log.
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn

View File

@ -0,0 +1,15 @@
# Dynamic Shared Object (DSO) Support
#
# To be able to use the functionality of a module which was built as a DSO you
# have to place corresponding `LoadModule' lines at this location so the
# directives contained in it are actually available _before_ they are used.
# Please read the file README.DSO in the Apache 1.3 distribution for more
# details about the DSO mechanism and run `httpd -l' for the list of already
# built-in (statically linked and thus always available) modules in your httpd
# binary.
#
# Example:
# LoadModule foo_module libexec/mod_foo.so
#
# Documentation for modules is in "/home/httpd/manual/mod" in HTML format.

View File

@ -0,0 +1,14 @@
{
sub load_modules {
my @list = @_;
my $out = '';
foreach (@list)
{
next unless -f "/usr/lib/httpd/modules/mod_${_}.so" ||
-f "/usr/lib64/httpd/modules/mod_${_}.so";
$out .= "LoadModule ${_}_module modules/mod_${_}.so\n";
}
return $out;
}
'';
}

View File

@ -0,0 +1,3 @@
{
$OUT .= load_modules(qw(env log_config));
}

View File

@ -0,0 +1,3 @@
# notify for systemd
LoadModule systemd_module modules/mod_systemd.so

View File

@ -0,0 +1,16 @@
{
$OUT .= load_modules(qw(
mime
negotiation
status
info
include
autoindex
dir
cgi
asis
imap
imagemap
actions
));
}

View File

@ -0,0 +1,23 @@
{
$OUT .= load_modules(qw(
proxy
proxy_http
alias
rewrite
authn_core
authz_core
authz_host
authz_user
authn_file
authn_anon
auth_digest
auth_basic
authz_groupfile
authnz_ldap
ldap
proxy_wstunnel
mpm_prefork
socache_dbm
unixd
));
}

View File

@ -0,0 +1,7 @@
{
$OUT .= load_modules(qw(
access_compat
));
}

View File

@ -0,0 +1,8 @@
{
$OUT .= load_modules(qw(
expires
headers
usertrack
setenvif
));
}

View File

@ -0,0 +1,4 @@
# Extra Modules
LoadModule authnz_external_module modules/mod_authnz_external.so

View File

@ -0,0 +1,7 @@
{
my $status = $modPerl{status};
return "# modPerl disabled" unless ($status and $status eq "enabled");
return "LoadModule perl_module modules/mod_perl.so";
}

View File

@ -0,0 +1,8 @@
{
# vim: ft=perl:
my $status = $modSSL{status} || 'disabled';
if ( $status eq "enabled" )
{
$OUT = "LoadModule ssl_module modules/mod_ssl.so";
}
}

View File

@ -0,0 +1,2 @@
DefineExternalAuth pwauth pipe /usr/bin/pwauth

View File

@ -0,0 +1,22 @@
{
my $listen_default = "Listen 0.0.0.0:$httpPort";
my $mode = $SystemMode || "serveronly";
return $listen_default if ($mode eq "serveronly");
my $httpdAccess = ${'httpd-e-smith'}{access} || 'private';
return $listen_default unless ($httpdAccess eq "private");
# Only selectively bind interfaces if we are in private server/gateway mode
my @ipAddresses = ("127.0.0.1", $LocalIP);
# Remove any duplicate IP addresses
my %ipAddresses = map { $_ => 1 } @ipAddresses;
foreach my $ip (sort keys %ipAddresses)
{
$OUT .= "Listen $ip:$httpPort\n";
}
}

View File

@ -0,0 +1,49 @@
{
use esmith::AccountsDB;
my $db = esmith::AccountsDB->open_ro;
return "" unless $db;
foreach my $path ($db->get_all_by_prop(type => 'ProxyPass'))
{
my $key = $path->key;
my $target = $path->prop('Target');
unless (defined $target)
{
warn("No Target property specified for ProxyPath $key." .
" Skipping...");
next;
}
my $desc = $path->prop('Description');
if (defined $desc)
{
$OUT .= "# ProxyPass: $key\n";
$OUT .= "# Description: $desc\n";
}
$OUT .= "ProxyPass\t/$key\t$target\n";
$OUT .= "ProxyPassReverse\t/$key\t$target\n";
$OUT .= "<Location /$key>\n";
my $proxyHTTP = $path->prop('HTTP') || "yes";
my $proxyHTTPS = $path->prop('HTTPS') || "yes";
if ( $proxyHTTP eq "no" )
{
$OUT .= " SSLRequireSSL\n";
}
if ( $proxyHTTPS eq "no" )
{
$OUT .= ' SSLRequire (%{HTTPS} eq "NULL")' . "\n";
}
my $valid = $path->prop('ValidFrom');
if (defined $valid)
{
# Convert from comma separated list to space separated
$valid =~ s/,/ /g;
# Make sure that /32 ValidFrom specs don't cause Apache problems.
$valid =~ s:/255.255.255.255::g;
$OUT .= " Require ip $valid\n";
}
$OUT .= "</Location>\n";
}
}

View File

@ -0,0 +1,8 @@
##########################################################
## SSL Global Context Configuration
##
## All SSL configuration in this context applies both to
## the main server and all SSL-enabled virtual hosts
## (unless overridden by virtual hosts)
##
<IfModule mod_ssl.c>

View File

@ -0,0 +1,24 @@
{
my $listen_default = "Listen 0.0.0.0:$httpsPort";
my $mode = $SystemMode || "serveronly";
return $listen_default if ($mode eq "serveronly");
my $httpdAccess = ${'httpd-e-smith'}{access} || 'private';
my $httpsOnlyLocal = ${'httpd-e-smith'}{httpsOnlyLocal} || 'disabled';
return $listen_default unless ($httpdAccess eq "private") || ($httpsOnlyLocal eq "enabled");
# Only selectively bind interfaces if we are in private server/gateway mode
my @ipAddresses = ("127.0.0.1", $LocalIP);
# Remove any duplicate IP addresses
my %ipAddresses = map { $_ => 1 } @ipAddresses;
foreach my $ip (sort keys %ipAddresses)
{
$OUT .= "Listen $ip:$httpsPort\n";
}
}

View File

@ -0,0 +1,4 @@
{
# Turn SSL on or off for this context
}
SSLEngine off

View File

@ -0,0 +1,2 @@
SSLProxyEngine On

View File

@ -0,0 +1,6 @@
{
my $chain_file = $modSSL{CertificateChainFile}
or return "# modSSL{CertificateChainFile} not set";
return "# modSSL{CertificateChainFile} does not exist" unless -e $chain_file;
$OUT = "SSLCertificateChainFile $chain_file";
}

View File

@ -0,0 +1,14 @@
{
my $defaultcrt = "/home/e-smith/ssl.crt/${SystemName}.${DomainName}.crt";
my $defaultkey = "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key";
my $crt = $modSSL{'crt'} || $defaultcrt;
$crt = $defaultcrt unless -e $crt;
my $key = $modSSL{'key'} || $defaultkey;
$key = $defaultkey unless -e $key;
$OUT .= <<SSL_END;
SSLCertificateFile $crt
SSLCertificateKeyFile $key
SSL_END
}

View File

@ -0,0 +1,5 @@
{
# When updating CipherSuite both e-smith-apache and smeserver-qpsmtpd templates should be updated.
$OUT = "SSLCipherSuite ";
$OUT .= $modSSL{CipherSuite} || 'ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:HIGH@STRENGTH:!SSLv2:!ADH:!aNULL:!MD5:!RC4';
}

View File

@ -0,0 +1,4 @@
{
my $HCO = ( ($modSSL{HonorCipherOrder}||'on') eq 'on') ? 'on' : 'off';
$OUT .= "SSLHonorCipherOrder $HCO\n";
}

View File

@ -0,0 +1,7 @@
{
# Pass Phrase Dialog:
# Configure the pass phrase gathering process.
# The filtering dialog program (`builtin' is a internal
# terminal dialog) has to provide the pass phrase on stdout.
}
SSLPassPhraseDialog builtin

View File

@ -0,0 +1,9 @@
{
# Inter-Process Session Cache:
# Configure the SSL Session Cache: either `none'
# or `dbm:/path/to/file' for the mechanism to use
#SSLSessionCache none
#SSLSessionCache shm:logs/ssl_scache(512000)
#SSLSessionCache dbm:logs/ssl_scache
}
SSLSessionCache dbm:state/ssl_scache

View File

@ -0,0 +1,5 @@
{
# Inter-Process Session Cache:
# the expiring timeout (in seconds).
}
SSLSessionCacheTimeout 300

View File

@ -0,0 +1 @@
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0

View File

@ -0,0 +1,6 @@
{
# Semaphore:
# Configure the path to the mutual explusion semaphore the
# SSL engine uses internally for inter-process synchronization.
}
Mutex sysvsem default

View File

@ -0,0 +1,13 @@
{
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
# SSL library. The seed data should be of good random quality.
#SSLRandomSeed startup builtin
#SSLRandomSeed startup file:/dev/random 512
#SSLRandomSeed startup file:/dev/urandom 512
#SSLRandomSeed connect builtin
#SSLRandomSeed connect file:/dev/random 512
#SSLRandomSeed connect file:/dev/urandom 512
}
SSLRandomSeed startup file:/dev/urandom 512
SSLRandomSeed connect builtin

View File

@ -0,0 +1,6 @@
{
# Logging:
# Log levels are (ascending order: higher ones include lower ones):
# none, error, warn, info, trace, debug.
}
#SSLLogLevel info

View File

@ -0,0 +1,9 @@
{
# Specify which SSL Protocols to accept for this context
$OUT .= "SSLProtocol all";
$OUT .= " -SSLv2" unless (${'httpd-e-smith'}{'SSLv2'} || 'disabled') eq 'enabled';
$OUT .= " -SSLv3" unless (${'httpd-e-smith'}{'SSLv3'} || 'disabled') eq 'enabled';
$OUT .= " -TLSv1" unless (${'httpd-e-smith'}{'TLSv1'} || 'disabled') eq 'enabled';
$OUT .= " -TLSv1.1" unless (${'httpd-e-smith'}{'TLSv1.1'} || 'disabled') eq 'enabled';
$OUT .= " -TLSv1.2" unless (${'httpd-e-smith'}{'TLSv1.2'} || 'enabled') eq 'enabled';
}

View File

@ -0,0 +1,7 @@
{
# Specify if SSLStrictSNIHostCheck should be turned off, this is required if each ibay has its own SSL certificates.
my $check_SSLStrictSNIVHostCheck = (${'httpd-e-smith'}{'SSLStrictSNIVHostCheck'} || 'off');
$OUT .= "SSLStrictSNIVHostCheck $check_SSLStrictSNIVHostCheck";
}

View File

@ -0,0 +1,4 @@
</IfModule>
#
# END OF SSL GLOBAL CONTEXT CONFIGURATION
#############################################

View File

@ -0,0 +1,10 @@
# The LockFile directive sets the path to the lockfile used when Apache
# is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
# USE_FLOCK_SERIALIZED_ACCEPT. This directive should normally be left at
# its default value. The main reason for changing it is if the logs
# directory is NFS mounted, since the lockfile MUST BE STORED ON A LOCAL
# DISK. The PID of the main server process is automatically appended to
# the filename.
#
#LockFile /var/lock/httpd.lock

View File

@ -0,0 +1,3 @@
# PidFile: The file the server should log its pid to
PidFile /var/run/httpd.pid

View File

@ -0,0 +1,6 @@
# ScoreBoardFile: File used to store internal server process information.
# Not all architectures require this. But if yours does (you'll know because
# this file is created when you run Apache) then you *must* ensure that
# no two invocations of Apache share the same scoreboard file.
ScoreBoardFile /var/run/httpd.scoreboard

View File

@ -0,0 +1,7 @@
# CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
# document that was negotiated on the basis of content. This asks proxy
# servers not to cache the document. Uncommenting the following line disables
# this behavior, and proxies will be allowed to cache the documents.
#CacheNegotiatedDocs

View File

@ -0,0 +1,8 @@
# UseCanonicalName: (new for 1.3) With this setting turned on, whenever
# Apache needs to construct a self-referencing URL (a url that refers back
# to the server the response is coming from) it will use ServerName and
# Port to form a "canonical" name. With this setting off, Apache will
# use the hostname:port that the client supplied, when possible. This
# also affects SERVER_NAME and SERVER_PORT in CGIs.
UseCanonicalName off

View File

@ -0,0 +1,26 @@
# The following directives define some format nicknames for use with
# a CustomLog directive (see below).
LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-Agent\}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-Agent\}i\"" combined_virtual
LogFormat "%\{Referer\}i -> %U" referer
LogFormat "%\{User-agent\}i" agent
# The location of the access logfile (Common Logfile Format).
# If this does not start with /, ServerRoot is prepended to it.
# CustomLog logs/access_log common
CustomLog /var/log/httpd/access_log combined_virtual
# If you would like to have an agent and referer logfile uncomment the
# following directives.
#CustomLog logs/referer_log referer
#CustomLog logs/agent_log agent
# If you prefer a single logfile with access, agent and referer information
# (Combined Logfile Format) you can use the following directive.
#CustomLog logs/access_log combined

View File

@ -0,0 +1 @@
FileETag MTime Size

View File

@ -0,0 +1,15 @@
# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
KeepAlive On
# MaxKeepAliveRequests: The maximum number of requests to allow
# during a persistent connection. Set to 0 to allow an unlimited amount.
# We reccomend you leave this number high, for maximum performance.
MaxKeepAliveRequests 100
# KeepAliveTimeout: Number of seconds to wait for the next request
KeepAliveTimeout 15

View File

@ -0,0 +1,17 @@
# Limit on total number of servers running, i.e., limit on the number
# of clients who can simultaneously connect --- if this limit is ever
# reached, clients will be LOCKED OUT, so it should NOT BE SET TOO LOW.
# It is intended mainly as a brake to keep a runaway server from taking
# Unix with it as it spirals down...
MaxClients 150
# MaxRequestsPerChild: the number of requests each child process is
# allowed to process before the child dies.
# The child will exit so as to avoid problems after prolonged use when
# Apache (and maybe the libraries it uses) leak. On most systems, this
# isn't really needed, but a few (such as Solaris) do have notable leaks
# in the libraries.
MaxRequestsPerChild 100

View File

@ -0,0 +1,5 @@
# Proxy Server directives. Uncomment the following line to
# enable the proxy server:
#ProxyRequests On

View File

@ -0,0 +1,10 @@
# ServerName allows you to set a host name which is sent back to clients for
# your server if it's different than the one the program would get (i.e. use
# "www" instead of the host's real name).
#
# Note: You cannot just invent host names and hope they work. The name you
# define here must be a valid DNS name for your host. If you don't understand
# this, ask your network administrator.
ServerName www.{ $DomainName }

View File

@ -0,0 +1,19 @@
# Server-pool size regulation. Rather than making you guess how many
# server processes you need, Apache dynamically adapts to the load it
# sees --- that is, it tries to maintain enough server processes to
# handle the current load, plus a few spare servers to handle transient
# load spikes (e.g., multiple simultaneous requests from a single
# Netscape browser).
# It does this by periodically checking how many servers are waiting
# for a request. If there are fewer than MinSpareServers, it creates
# a new spare. If there are more than MaxSpareServers, some of the
# spares die off. These values are probably OK for most sites ---
MinSpareServers 8
MaxSpareServers 20
# Number of servers to start --- should be a reasonable ballpark figure.
StartServers 10

View File

@ -0,0 +1,4 @@
# Timeout: The number of seconds before receives and sends time out
Timeout 300

View File

@ -0,0 +1,5 @@
# DefaultIcon is which icon to show for files which do not have an icon
# explicitly set.
DefaultIcon /icons/unknown.gif

View File

@ -0,0 +1,5 @@
# DirectoryIndex: Name of the file or files to use as a pre-written HTML
# directory index. Separate multiple entries with spaces.
DirectoryIndex index.htm index.html index.shtml index.cgi

View File

@ -0,0 +1,5 @@
# DocumentRoot: The directory out of which you will serve your
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
DocumentRoot /home/e-smith/files/ibays/Primary/html

View File

@ -0,0 +1 @@
IndexOptions FancyIndexing VersionSort NameWidth=*

View File

@ -0,0 +1,5 @@
# AddIcon tells the server which icon to show for different files or filename
# extensions
AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip

View File

@ -0,0 +1,5 @@
# AccessFileName: The name of the file to look for in each directory
# for access control information.
AccessFileName .htaccess

View File

@ -0,0 +1,4 @@
# AddDescription allows you to place a short description after a file in
# server-generated indexes.
# Format: AddDescription "description" filename

View File

@ -0,0 +1,5 @@
AddIconByType (TXT,/icons/text.gif) text/*
AddIconByType (IMG,/icons/image2.gif) image/*
AddIconByType (SND,/icons/sound2.gif) audio/*
AddIconByType (VID,/icons/movie.gif) video/*

View File

@ -0,0 +1,5 @@
# DefaultType is the default MIME type for documents which the server
# cannot find the type of from filename extensions.
DefaultType none

View File

@ -0,0 +1,4 @@
# IndexIgnore is a set of filenames which directory indexing should ignore
# Format: IndexIgnore name1 name2...
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t

View File

@ -0,0 +1,5 @@
# TypesConfig describes where the mime.types file (or equivalent) is
# to be found.
TypesConfig /etc/mime.types

View File

@ -0,0 +1,6 @@
# AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
# information on the fly. Note: Not all browsers support this.
AddEncoding x-compress Z
AddEncoding x-gzip gz

View File

@ -0,0 +1,22 @@
AddIcon /icons/binary.gif .bin .exe
AddIcon /icons/binhex.gif .hqx
AddIcon /icons/tar.gif .tar
AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
AddIcon /icons/a.gif .ps .ai .eps
AddIcon /icons/layout.gif .html .shtml .htm .pdf
AddIcon /icons/text.gif .txt
AddIcon /icons/c.gif .c
AddIcon /icons/p.gif .pl .py
AddIcon /icons/f.gif .for
AddIcon /icons/dvi.gif .dvi
AddIcon /icons/uuencoded.gif .uu
AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
AddIcon /icons/tex.gif .tex
AddIcon /icons/bomb.gif core
AddIcon /icons/back.gif ..
AddIcon /icons/hand.right.gif README
AddIcon /icons/folder.gif ^^DIRECTORY^^
AddIcon /icons/blank.gif ^^BLANKICON^^

View File

@ -0,0 +1,14 @@
# AddLanguage allows you to specify the language of a document. You can
# then use content negotiation to give a browser a file in a language
# it can understand. Note that the suffix does not have to be the same
# as the language keyword --- those with documents in Polish (whose
# net-standard language code is pl) may wish to use "AddLanguage pl .po"
# to avoid the ambiguity with the common suffix for perl scripts.
AddLanguage en .en
AddLanguage fr .fr
AddLanguage de .de
AddLanguage da .da
AddLanguage el .el
AddLanguage it .it

View File

@ -0,0 +1,6 @@
# LanguagePriority allows you to give precedence to some languages
# in case of a tie during content negotiation.
# Just list the languages in decreasing order of preference.
LanguagePriority en fr de

View File

@ -0,0 +1,5 @@
# AddType allows you to tweak mime.types without actually editing it, or to
# make certain files to be certain types.
# Format: AddType type/subtype ext1

View File

@ -0,0 +1,3 @@
# Microsoft Office Word 2007 macro-enabled document
AddType application/vnd.ms-word.document.macroEnabled.12 .docm

View File

@ -0,0 +1,2 @@
# Microsoft Office Word 2007 document
AddType application/vnd.openxmlformats-officedocument.wordprocessingml.document .docx

View File

@ -0,0 +1,2 @@
# Microsoft Office Word 2007 macro-enabled document template
AddType application/vnd.ms-word.template.macroEnabled.12 .dotm

View File

@ -0,0 +1,2 @@
# Microsoft Office Word 2007 template
AddType application/vnd.openxmlformats-officedocument.wordprocessingml.template .dotx

View File

@ -0,0 +1,2 @@
# Fix up default type for .exe files.
AddType application/octet-stream .exe

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.database .odb

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.chart .odc

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.formula .odf

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.graphics .odg

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.image .odi

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.text-master .odm

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.presentation .odp

View File

@ -0,0 +1 @@
AddType application/vnd.oasis.opendocument.spreadsheet .ods

Some files were not shown because too many files have changed in this diff Show More