auto-import changelog data from httpd-2.0.36-7.src.rpm
Wed Jul 10 2002 Joe Orton <jorton@redhat.com> 2.0.36-7 - use /sbin/nologin as shell for apache user (#68371) - add patch from CVS to fix possible infinite loop when processing internal redirects Wed Jun 26 2002 Gary Benson <gbenson@redhat.com> 2.0.36-6 - modify init script to detect 1.3.x httpd.conf's and direct users to the migration guide Tue Jun 25 2002 Gary Benson <gbenson@redhat.com> 2.0.36-5 - patch apachectl to detect 1.3.x httpd.conf's and direct users to the migration guide - ship the migration guide Fri Jun 21 2002 Joe Orton <jorton@redhat.com> - move /etc/httpd2 back to /etc/httpd - add noindex.html page and poweredby logo; tweak default config to load noindex.html if no default "/" page is present. - add patch to prevent mutex errors on graceful restart Fri Jun 21 2002 Tim Powers <timp@redhat.com> 2.0.36-4 - automated rebuild Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-3 - add patch to fix SSL mutex handling Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-2 - improved config directory patch Mon May 20 2002 Joe Orton <jorton@redhat.com> - initial build; based heavily on apache.spec and mod_ssl.spec - fixes: #65214, #58490, #57376, #61265, #65518, #58177, #57245
This commit is contained in:
cvsdist
parent
e91b33a911
commit
3cbd43bfe9
@ -0,0 +1 @@
|
||||
httpd-2.0.36.tar.gz
|
||||
4
README.confd
Normal file
4
README.confd
Normal file
@ -0,0 +1,4 @@
|
||||
|
||||
This directory holds Apache 2.0 module-specific configuration files;
|
||||
any files in this directory which have the ".conf" extension will be
|
||||
processed as Apache configuration files.
|
||||
1028
httpd.conf
Normal file
1028
httpd.conf
Normal file
File diff suppressed because it is too large
Load Diff
107
httpd.init
Executable file
107
httpd.init
Executable file
@ -0,0 +1,107 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Startup script for the Apache Web Server
|
||||
#
|
||||
# chkconfig: - 85 15
|
||||
# description: Apache is a World Wide Web server. It is used to serve \
|
||||
# HTML files and CGI.
|
||||
# processname: httpd
|
||||
# pidfile: /var/run/httpd.pid
|
||||
# config: /etc/httpd/conf/httpd.conf
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
if [ -f /etc/sysconfig/httpd ]; then
|
||||
. /etc/sysconfig/httpd
|
||||
fi
|
||||
|
||||
# This will prevent initlog from swallowing up a pass-phrase prompt if
|
||||
# mod_ssl needs a pass-phrase from the user.
|
||||
INITLOG_ARGS=""
|
||||
|
||||
# Path to the apachectl script, server binary, and short-form for messages.
|
||||
apachectl=/usr/sbin/apachectl
|
||||
httpd=/usr/sbin/httpd
|
||||
prog=httpd
|
||||
RETVAL=0
|
||||
|
||||
# check for 1.3 configuration
|
||||
check13 () {
|
||||
CONFFILE=/etc/httpd/conf/httpd.conf
|
||||
GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|"
|
||||
GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|"
|
||||
GONE="${GONE}AccessConfig|ResourceConfig)"
|
||||
if grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
|
||||
echo
|
||||
echo 1>&2 " apache 1.3 configuration directives found"
|
||||
echo 1>&2 " please read @docdir@/migration.html"
|
||||
failure "apache 1.3 config directives test"
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# The semantics of these two functions differ from the way apachectl does
|
||||
# things -- attempting to start while running is a failure, and shutdown
|
||||
# when not running is also a failure. So we just do it the way init scripts
|
||||
# are expected to behave here.
|
||||
start() {
|
||||
echo -n $"Starting $prog: "
|
||||
check13 || exit 1
|
||||
daemon $httpd $OPTIONS
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL = 0 ] && touch /var/lock/subsys/httpd
|
||||
return $RETVAL
|
||||
}
|
||||
stop() {
|
||||
echo -n $"Stopping $prog: "
|
||||
killproc $httpd
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/httpd /var/run/httpd.pid
|
||||
}
|
||||
reload() {
|
||||
echo -n $"Reloading $prog: "
|
||||
check13 || exit 1
|
||||
killproc $httpd -HUP
|
||||
RETVAL=$?
|
||||
echo
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
status)
|
||||
status $httpd
|
||||
RETVAL=$?
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
condrestart)
|
||||
if [ -f /var/run/httpd.pid ] ; then
|
||||
stop
|
||||
start
|
||||
fi
|
||||
;;
|
||||
reload)
|
||||
reload
|
||||
;;
|
||||
graceful|help|configtest|fullstatus)
|
||||
$apachectl $@
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
8
httpd.logrotate
Normal file
8
httpd.logrotate
Normal file
@ -0,0 +1,8 @@
|
||||
/var/log/httpd/*log {
|
||||
missingok
|
||||
notifempty
|
||||
sharedscripts
|
||||
postrotate
|
||||
/bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
|
||||
endscript
|
||||
}
|
||||
380
httpd.spec
Normal file
380
httpd.spec
Normal file
@ -0,0 +1,380 @@
|
||||
%define contentdir /var/www
|
||||
%define suexec_caller apache
|
||||
|
||||
Summary: Apache HTTP Server
|
||||
Name: httpd
|
||||
Version: 2.0.36
|
||||
Release: 7
|
||||
URL: http://httpd.apache.org/
|
||||
Vendor: Red Hat, Inc.
|
||||
Source0: httpd://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
|
||||
Source1: index.html
|
||||
Source3: httpd.logrotate
|
||||
Source4: httpd.init
|
||||
Source5: README.confd
|
||||
Source6: powered_by.gif
|
||||
Source10: httpd.conf
|
||||
Source11: ssl.conf
|
||||
Source12: migration.html
|
||||
Source13: migration.css
|
||||
# build/scripts patches
|
||||
Patch0: httpd-2.0.36-destdir.patch
|
||||
Patch1: httpd-2.0.36-apctl.patch
|
||||
Patch2: httpd-2.0.36-apxs.patch
|
||||
Patch3: httpd-2.0.36-sslink.patch
|
||||
# fixes
|
||||
Patch10: httpd-2.0.36-include.patch
|
||||
Patch11: httpd-2.0.36-synok.patch
|
||||
Patch12: httpd-2.0.36-suexec.patch
|
||||
Patch13: httpd-2.0.36-userdir.patch
|
||||
Patch14: httpd-2.0.36-mutex.patch
|
||||
Patch15: httpd-2.0.36-restart.patch
|
||||
Patch16: httpd-2.0.36-loop.patch
|
||||
# features/functional changes
|
||||
Patch40: httpd-2.0.36-cnfdir.patch
|
||||
Patch41: httpd-2.0.36-redhat.patch
|
||||
License: Apache Software License
|
||||
Group: System Environment/Daemons
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
BuildPrereq: db4-devel, expat-devel, findutils, perl
|
||||
Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
|
||||
Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
|
||||
Prereq: sh-utils, textutils, /usr/sbin/useradd
|
||||
Provides: webserver
|
||||
Conflicts: thttpd
|
||||
Obsoletes: apache, secureweb, mod_dav
|
||||
|
||||
%description
|
||||
Apache is a powerful, full-featured, efficient, and freely-available
|
||||
Web server. Apache is also the most popular Web server on the
|
||||
Internet.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Development tools for the Apache HTTP server.
|
||||
Obsoletes: secureweb-devel, apache-devel
|
||||
Requires: libtool, httpd = %{version}
|
||||
|
||||
%description devel
|
||||
The httpd-devel package contains the APXS binary and other files
|
||||
that you need to build Dynamic Shared Objects (DSOs) for Apache.
|
||||
|
||||
If you are installing the Apache HTTP server and you want to be
|
||||
able to compile or develop additional modules for Apache, you need
|
||||
to install this package.
|
||||
|
||||
%package manual
|
||||
Group: Documentation
|
||||
Summary: Documentation for the Apache HTTP server.
|
||||
Obsoletes: secureweb-manual, apache-manual
|
||||
|
||||
%description manual
|
||||
The httpd-manual package contains the complete manual and
|
||||
reference guide for the Apache HTTP server. The information can
|
||||
also be found at http://httpd.apache.org/docs/.
|
||||
|
||||
%package -n mod_ssl
|
||||
Group: System Environment/Daemons
|
||||
Summary: SSL/TLS module for the Apache HTTP server
|
||||
Serial: 1
|
||||
BuildPrereq: openssl-devel
|
||||
Prereq: openssl, dev, /bin/cat
|
||||
Requires: httpd, make
|
||||
|
||||
%description -n mod_ssl
|
||||
The mod_ssl module provides strong cryptography for the Apache Web
|
||||
server via the Secure Sockets Layer (SSL) and Transport Layer
|
||||
Security (TLS) protocols.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0 -b .destdir
|
||||
%patch1 -p0 -b .apctl
|
||||
%patch2 -p0 -b .apxs
|
||||
%patch3 -p0 -b .sslink
|
||||
|
||||
%patch10 -p0 -b .incl
|
||||
%patch11 -p0 -b .synok
|
||||
%patch12 -p0 -b .suexec
|
||||
%patch13 -p0 -b .userdir
|
||||
%patch14 -p0 -b .mutex
|
||||
%patch15 -p0 -b .restart
|
||||
%patch16 -p0 -b .loop
|
||||
|
||||
%patch40 -p0 -b .cnfdir
|
||||
%patch41 -p0 -b .redhat
|
||||
|
||||
# copy across the migration guide and sed it's location into apachectl
|
||||
cp $RPM_SOURCE_DIR/migration.{html,css} .
|
||||
%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
|
||||
support/apachectl.in
|
||||
|
||||
# regenerate configure scripts
|
||||
./buildconf
|
||||
|
||||
%build
|
||||
./configure \
|
||||
--prefix=%{_sysconfdir}/httpd \
|
||||
--exec-prefix=%{_prefix} \
|
||||
--bindir=%{_bindir} \
|
||||
--sbindir=%{_sbindir} \
|
||||
--mandir=%{_mandir} \
|
||||
--sysconfdir=%{_sysconfdir}/httpd/conf \
|
||||
--includedir=%{_includedir}/httpd \
|
||||
--libexecdir=%{_libdir}/httpd/modules \
|
||||
--datadir=%{contentdir} \
|
||||
--with-mpm=prefork \
|
||||
--enable-mods-shared=all \
|
||||
--enable-suexec --with-suexec \
|
||||
--with-suexec-caller=%{suexec_caller} \
|
||||
--with-suexec-docroot=%{contentdir} \
|
||||
--with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
|
||||
--with-suexec-bin=%{_sbindir}/suexec \
|
||||
--with-suexec-uidmin=500 --with-suexec-gidmin=500 \
|
||||
--enable-ssl --with-ssl \
|
||||
--enable-proxy --enable-proxy-connect \
|
||||
--enable-proxy-http --enable-proxy-ftp
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# Classify ab and logresolve as section 1 commands, as they are in /usr/bin
|
||||
mv docs/man/ab.8 docs/man/ab.1
|
||||
sed -e "1s/logresolve 8/logresolve 1/" \
|
||||
< docs/man/logresolve.8 > docs/man/logresolve.1
|
||||
rm docs/man/logresolve.8
|
||||
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
||||
### remove this
|
||||
strip -g $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so
|
||||
|
||||
# install conf file/directory
|
||||
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
|
||||
install -m 644 $RPM_SOURCE_DIR/README.confd \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
|
||||
install -m 644 $RPM_SOURCE_DIR/ssl.conf \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ssl.conf
|
||||
|
||||
rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
|
||||
install -m 644 $RPM_SOURCE_DIR/httpd.conf \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
|
||||
|
||||
# mod_ssl bits
|
||||
for suffix in crl crt csr key prm; do
|
||||
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/ssl.${suffix}
|
||||
done
|
||||
|
||||
# for holding mod_dav lock database
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav
|
||||
|
||||
# move utilities to /usr/bin
|
||||
mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
|
||||
$RPM_BUILD_ROOT%{_bindir}
|
||||
|
||||
# make libtool a symlink
|
||||
mv $RPM_BUILD_ROOT%{contentdir}/build $RPM_BUILD_ROOT%{_libdir}/httpd/build
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/httpd/build/libtool
|
||||
ln -s ../../../..%{_bindir}/libtool $RPM_BUILD_ROOT%{_libdir}/httpd/build/libtool
|
||||
# fix up config_vars file
|
||||
sed -e "s|/var/www/build|%{_libdir}/httpd/build|g" \
|
||||
-e "/AP_LIBS/d" -e "/abs_srcdir/d" < build/config_vars.mk \
|
||||
> $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk
|
||||
|
||||
# docroot
|
||||
mkdir $RPM_BUILD_ROOT%{contentdir}/html
|
||||
install -m 644 $RPM_SOURCE_DIR/index.html \
|
||||
$RPM_BUILD_ROOT%{contentdir}/error/noindex.html
|
||||
rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
|
||||
rm $RPM_BUILD_ROOT%{contentdir}/manual/*/*.xml
|
||||
|
||||
install -m 644 $RPM_SOURCE_DIR/powered_by.gif \
|
||||
$RPM_BUILD_ROOT%{contentdir}/icons
|
||||
|
||||
# logs
|
||||
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/httpd
|
||||
|
||||
# symlinks for /etc/httpd
|
||||
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
|
||||
ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
|
||||
ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
|
||||
ln -s ../..%{_libdir}/httpd/build $RPM_BUILD_ROOT/etc/httpd/build
|
||||
|
||||
# install SYSV init stuff
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
||||
install -m755 $RPM_SOURCE_DIR/httpd.init \
|
||||
$RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
|
||||
%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
|
||||
$RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
|
||||
|
||||
# install log rotation stuff
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
||||
install -m644 $RPM_SOURCE_DIR/httpd.logrotate \
|
||||
$RPM_BUILD_ROOT/etc/logrotate.d/httpd
|
||||
|
||||
# fix man page paths
|
||||
sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
|
||||
-e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \
|
||||
-e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
|
||||
-e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
|
||||
-e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
|
||||
-e "s|/usr/local/apache2/logs/httpd.pid|/var/run/httpd.pid|" \
|
||||
-e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
|
||||
> $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
|
||||
|
||||
%pre
|
||||
# Add the "apache" user
|
||||
/usr/sbin/useradd -c "Apache" -u 48 \
|
||||
-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
|
||||
|
||||
%post
|
||||
# Register the httpd service
|
||||
/sbin/chkconfig --add httpd
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/service httpd stop > /dev/null 2>&1
|
||||
/sbin/chkconfig --del httpd
|
||||
fi
|
||||
|
||||
%post -n mod_ssl
|
||||
/sbin/ldconfig ### is this needed?
|
||||
umask 077
|
||||
|
||||
if [ ! -f %{_sysconfdir}/httpd/conf/ssl.key/server.key ] ; then
|
||||
%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/httpd/conf/ssl.key/server.key 2> /dev/null
|
||||
fi
|
||||
|
||||
FQDN=`hostname`
|
||||
if [ "x${FQDN}" = "x" ]; then
|
||||
FQDN=localhost.localdomain
|
||||
fi
|
||||
|
||||
if [ ! -f %{_sysconfdir}/httpd/conf/ssl.crt/server.crt ] ; then
|
||||
cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/httpd/conf/ssl.key/server.key -x509 -days 365 -out %{_sysconfdir}/httpd/conf/ssl.crt/server.crt 2>/dev/null
|
||||
--
|
||||
SomeState
|
||||
SomeCity
|
||||
SomeOrganization
|
||||
SomeOrganizationalUnit
|
||||
${FQDN}
|
||||
root@${FQDN}
|
||||
EOF
|
||||
fi
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
|
||||
%doc ABOUT_APACHE README CHANGES ROADMAP LICENSE
|
||||
%doc migration.html migration.css
|
||||
|
||||
%dir %{_sysconfdir}/httpd
|
||||
%{_sysconfdir}/httpd/modules
|
||||
%{_sysconfdir}/httpd/logs
|
||||
%{_sysconfdir}/httpd/run
|
||||
%dir %{_sysconfdir}/httpd/conf
|
||||
%config(noreplace) %{_sysconfdir}/httpd/conf/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/httpd/conf/magic
|
||||
|
||||
%config %{_sysconfdir}/logrotate.d/httpd
|
||||
%config %{_sysconfdir}/rc.d/init.d/httpd
|
||||
|
||||
%dir %{_sysconfdir}/httpd/conf.d
|
||||
%{_sysconfdir}/httpd/conf.d/README
|
||||
|
||||
%{_bindir}/ab
|
||||
%{_bindir}/ht*
|
||||
%{_bindir}/logresolve
|
||||
%{_sbindir}/httpd
|
||||
%{_sbindir}/apachectl
|
||||
%{_sbindir}/rotatelogs
|
||||
%attr(4510,root,%{suexec_caller}) %{_sbindir}/suexec
|
||||
|
||||
%{_libdir}/libapr.so.*
|
||||
%{_libdir}/libaprutil.so.*
|
||||
|
||||
%dir %{_libdir}/httpd
|
||||
%dir %{_libdir}/httpd/modules
|
||||
# everything but mod_ssl.so:
|
||||
%{_libdir}/httpd/modules/mod_[a-r]*.so
|
||||
%{_libdir}/httpd/modules/mod_s[petu]*.so
|
||||
%{_libdir}/httpd/modules/mod_[t-z]*.so
|
||||
|
||||
%dir %{contentdir}
|
||||
%dir %{contentdir}/cgi-bin
|
||||
%dir %{contentdir}/html
|
||||
%dir %{contentdir}/icons
|
||||
%{contentdir}/icons/*
|
||||
%config(noreplace) %{contentdir}/error
|
||||
|
||||
%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
|
||||
|
||||
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
|
||||
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%{_mandir}/man8/apachectl*
|
||||
%{_mandir}/man8/httpd*
|
||||
%{_mandir}/man8/rotatelogs*
|
||||
%{_mandir}/man8/suexec*
|
||||
|
||||
%files manual
|
||||
%defattr(-,root,root)
|
||||
%{contentdir}/manual
|
||||
|
||||
%files -n mod_ssl
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/httpd/modules/mod_ssl.so
|
||||
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf
|
||||
%dir %{_sysconfdir}/httpd/conf/ssl.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libapr.so
|
||||
%{_libdir}/libaprutil.so
|
||||
%{_includedir}/httpd
|
||||
%{_sysconfdir}/httpd/build
|
||||
%{_sbindir}/apxs
|
||||
%{_mandir}/man8/apxs.8*
|
||||
%dir %{_libdir}/httpd/build
|
||||
%{_libdir}/httpd/build/*.mk
|
||||
%{_libdir}/httpd/build/libtool
|
||||
|
||||
%changelog
|
||||
* Wed Jul 10 2002 Joe Orton <jorton@redhat.com> 2.0.36-7
|
||||
- use /sbin/nologin as shell for apache user (#68371)
|
||||
- add patch from CVS to fix possible infinite loop when processing
|
||||
internal redirects
|
||||
|
||||
* Wed Jun 26 2002 Gary Benson <gbenson@redhat.com> 2.0.36-6
|
||||
- modify init script to detect 1.3.x httpd.conf's and direct users
|
||||
to the migration guide
|
||||
|
||||
* Tue Jun 25 2002 Gary Benson <gbenson@redhat.com> 2.0.36-5
|
||||
- patch apachectl to detect 1.3.x httpd.conf's and direct users
|
||||
to the migration guide
|
||||
- ship the migration guide
|
||||
|
||||
* Fri Jun 21 2002 Joe Orton <jorton@redhat.com>
|
||||
- move /etc/httpd2 back to /etc/httpd
|
||||
- add noindex.html page and poweredby logo; tweak default config
|
||||
to load noindex.html if no default "/" page is present.
|
||||
- add patch to prevent mutex errors on graceful restart
|
||||
|
||||
* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 2.0.36-4
|
||||
- automated rebuild
|
||||
|
||||
* Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-3
|
||||
- add patch to fix SSL mutex handling
|
||||
|
||||
* Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-2
|
||||
- improved config directory patch
|
||||
|
||||
* Mon May 20 2002 Joe Orton <jorton@redhat.com>
|
||||
- initial build; based heavily on apache.spec and mod_ssl.spec
|
||||
- fixes: #65214, #58490, #57376, #61265, #65518, #58177, #57245
|
||||
86
index.html
Normal file
86
index.html
Normal file
@ -0,0 +1,86 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE>Test Page for the Apache Web Server on Red Hat Linux</TITLE>
|
||||
</HEAD>
|
||||
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
|
||||
<BODY BGCOLOR="#FFFFFF">
|
||||
|
||||
<H1 ALIGN="CENTER">Test Page</H1>
|
||||
This page is used to test the proper operation of the Apache Web server after
|
||||
it has been installed. If you can read this page, it means that the Apache
|
||||
Web server installed at this site is working properly.
|
||||
|
||||
<HR WIDTH="50%">
|
||||
|
||||
<H2 ALIGN="CENTER">If you are the administrator of this website:</H2>
|
||||
<P>
|
||||
You may now add content to this directory, and replace this page. Note that
|
||||
until you do so, people visiting your website will see this page, and not your
|
||||
content.
|
||||
</P>
|
||||
|
||||
<P>If you have upgraded from Red Hat Linux 6.2 and earlier, then you are
|
||||
seeing this page because the default <A
|
||||
href="manual/mod/core.html#documentroot"><STRONG>DocumentRoot</STRONG></A>
|
||||
set in <TT>/etc/httpd/conf/httpd.conf</TT> has changed. Any subdirectories
|
||||
which existed under <TT>/home/httpd</TT> should now be moved to
|
||||
<TT>/var/www</TT>. Alternatively, the contents of <TT>/var/www</TT> can be
|
||||
moved to <TT>/home/httpd</TT>, and the configuration file can be updated
|
||||
accordingly.
|
||||
</P>
|
||||
|
||||
<HR WIDTH="50%">
|
||||
<H2 ALIGN="CENTER">If you are a member of the general public:</H2>
|
||||
|
||||
<P>
|
||||
The fact that you are seeing this page indicates that the website you just
|
||||
visited is either experiencing problems, or is undergoing routine maintenance.
|
||||
</P>
|
||||
|
||||
<P>
|
||||
If you would like to let the administrators of this website know that you've
|
||||
seen this page instead of the page you expected, you should send them e-mail.
|
||||
In general, mail sent to the name "webmaster" and directed to the website's
|
||||
domain should reach the appropriate person.
|
||||
</P>
|
||||
|
||||
<P>
|
||||
For example, if you experienced problems while visiting www.example.com,
|
||||
you should send e-mail to "webmaster@example.com".
|
||||
</P>
|
||||
|
||||
<HR WIDTH="50%">
|
||||
|
||||
<P>
|
||||
The Apache <A HREF="manual/index.html" >documentation</A> has been included
|
||||
with this distribution.
|
||||
</P>
|
||||
|
||||
<P>
|
||||
For documentation and information on Red Hat Linux, please visit the
|
||||
<a href="http://www.redhat.com/">Red Hat, Inc.</a> website. The manual for
|
||||
Red Hat Linux is available <a href="http://www.redhat.com/manual">here</a>.
|
||||
</P>
|
||||
|
||||
<P>
|
||||
You are free to use the image below on an Apache-powered Web
|
||||
server. Thanks for using Apache!
|
||||
</P>
|
||||
|
||||
<P ALIGN="CENTER">
|
||||
<A HREF="http://www.apache.org/"><IMG SRC="/icons/apache_pb.gif" ALT="[ Powered
|
||||
by Apache ]"></A>
|
||||
</P>
|
||||
|
||||
<P>
|
||||
You are free to use the image below on a Red Hat Linux-powered Web
|
||||
server. Thanks for using Red Hat Linux!
|
||||
</P>
|
||||
|
||||
<P ALIGN="center">
|
||||
<A HREF="http://www.redhat.com/"><IMG SRC="/icons/powered_by.gif" ALT="[ Powered
|
||||
by Red Hat Linux ]"></A>
|
||||
</P>
|
||||
</BODY>
|
||||
</HTML>
|
||||
18
migration.css
Normal file
18
migration.css
Normal file
@ -0,0 +1,18 @@
|
||||
|
||||
p { margin-left: 0.4em; margin-right: 0.4em; }
|
||||
|
||||
pre.programlisting {
|
||||
background-color: #dddddd;
|
||||
margin-left: 0.6em; margin-right: 1em;
|
||||
padding: 0.3em; width: 50em;
|
||||
}
|
||||
|
||||
h1.title { border-bottom: solid #cc3333; }
|
||||
|
||||
div.toc {
|
||||
border-right: thin solid #cc3333;
|
||||
}
|
||||
|
||||
h2 { border-top: thin solid #cc3333;
|
||||
padding-top: 1em; }
|
||||
|
||||
263
ssl.conf
Normal file
263
ssl.conf
Normal file
@ -0,0 +1,263 @@
|
||||
#
|
||||
# This is the Apache server configuration file providing SSL support.
|
||||
# It contains the configuration directives to instruct the server how to
|
||||
# serve pages over an https connection. For detailing information about these
|
||||
# directives see <URL:http://httpd.apache.org/docs-2.0/mod/mod_ssl.html>
|
||||
#
|
||||
# For the moment, see <URL:http://www.modssl.org/docs/> for this info.
|
||||
# The documents are still being prepared from material donated by the
|
||||
# modssl project.
|
||||
#
|
||||
# Do NOT simply read the instructions in here without understanding
|
||||
# what they do. They're here only as hints or reminders. If you are unsure
|
||||
# consult the online docs. You have been warned.
|
||||
#
|
||||
|
||||
LoadModule ssl_module modules/mod_ssl.so
|
||||
|
||||
# Until documentation is completed, please check http://www.modssl.org/
|
||||
# for additional config examples and module docmentation. Directives
|
||||
# and features of mod_ssl are largely unchanged from the mod_ssl project
|
||||
# for Apache 1.3.
|
||||
|
||||
#
|
||||
# When we also provide SSL we have to listen to the
|
||||
# standard HTTP port (see above) and to the HTTPS port
|
||||
#
|
||||
Listen 443
|
||||
|
||||
#
|
||||
# Dynamic Shared Object (DSO) Support
|
||||
#
|
||||
# To be able to use the functionality of a module which was built as a DSO you
|
||||
# ErrorLog logs/dummy-host.example.com-error_log
|
||||
# CustomLog logs/dummy-host.example.com-access_log common
|
||||
|
||||
##
|
||||
## SSL Global Context
|
||||
##
|
||||
## All SSL configuration in this context applies both to
|
||||
## the main server and all SSL-enabled virtual hosts.
|
||||
##
|
||||
|
||||
#
|
||||
# Some MIME-types for downloading Certificates and CRLs
|
||||
#
|
||||
AddType application/x-x509-ca-cert .crt
|
||||
AddType application/x-pkcs7-crl .crl
|
||||
|
||||
# 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
|
||||
|
||||
# Inter-Process Session Cache:
|
||||
# Configure the SSL Session Cache: First the mechanism
|
||||
# to use and second the expiring timeout (in seconds).
|
||||
#SSLSessionCache none
|
||||
#SSLSessionCache shmht:logs/ssl_scache(512000)
|
||||
#SSLSessionCache shmcb:logs/ssl_scache(512000)
|
||||
SSLSessionCache dbm:logs/ssl_scache
|
||||
SSLSessionCacheTimeout 300
|
||||
|
||||
# Semaphore:
|
||||
# Configure the path to the mutual exclusion semaphore the
|
||||
# SSL engine uses internally for inter-process synchronization.
|
||||
SSLMutex file:logs/ssl_mutex
|
||||
|
||||
# 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.
|
||||
# WARNING! On some platforms /dev/random blocks if not enough entropy
|
||||
# is available. This means you then cannot use the /dev/random device
|
||||
# because it would lead to very long connection times (as long as
|
||||
# it requires to make more entropy available). But usually those
|
||||
# platforms additionally provide a /dev/urandom device which doesn't
|
||||
# block. So, if available, use this one instead. Read the mod_ssl User
|
||||
# Manual for more details.
|
||||
SSLRandomSeed startup builtin
|
||||
SSLRandomSeed connect builtin
|
||||
#SSLRandomSeed startup file:/dev/random 512
|
||||
#SSLRandomSeed startup file:/dev/urandom 512
|
||||
#SSLRandomSeed connect file:/dev/random 512
|
||||
#SSLRandomSeed connect file:/dev/urandom 512
|
||||
|
||||
# Logging:
|
||||
# The home of the dedicated SSL protocol logfile. Errors are
|
||||
# additionally duplicated in the general error log file. Put
|
||||
# this somewhere where it cannot be used for symlink attacks on
|
||||
# a real server (i.e. somewhere where only root can write).
|
||||
# Log levels are (ascending order: higher ones include lower ones):
|
||||
# none, error, warn, info, trace, debug.
|
||||
SSLLog logs/ssl_engine_log
|
||||
SSLLogLevel info
|
||||
|
||||
##
|
||||
## SSL Virtual Host Context
|
||||
##
|
||||
|
||||
<VirtualHost _default_:443>
|
||||
|
||||
# General setup for the virtual host
|
||||
DocumentRoot "/var/www/html"
|
||||
ServerName new.host.name:443
|
||||
ServerAdmin you@your.address
|
||||
ErrorLog logs/ssl_error_log
|
||||
TransferLog logs/ssl_access_log
|
||||
|
||||
# SSL Engine Switch:
|
||||
# Enable/Disable SSL for this virtual host.
|
||||
SSLEngine on
|
||||
|
||||
# SSL Cipher Suite:
|
||||
# List the ciphers that the client is permitted to negotiate.
|
||||
# See the mod_ssl documentation for a complete list.
|
||||
SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
|
||||
|
||||
# Server Certificate:
|
||||
# Point SSLCertificateFile at a PEM encoded certificate. If
|
||||
# the certificate is encrypted, then you will be prompted for a
|
||||
# pass phrase. Note that a kill -HUP will prompt again. A test
|
||||
# certificate can be generated with `make certificate' under
|
||||
# built time. Keep in mind that if you've both a RSA and a DSA
|
||||
# certificate you can configure both in parallel (to also allow
|
||||
# the use of DSA ciphers, etc.)
|
||||
SSLCertificateFile /etc/httpd/conf/ssl.crt/server.crt
|
||||
#SSLCertificateFile /etc/httpd/conf/ssl.crt/server-dsa.crt
|
||||
|
||||
# Server Private Key:
|
||||
# If the key is not combined with the certificate, use this
|
||||
# directive to point at the key file. Keep in mind that if
|
||||
# you've both a RSA and a DSA private key you can configure
|
||||
# both in parallel (to also allow the use of DSA ciphers, etc.)
|
||||
SSLCertificateKeyFile /etc/httpd/conf/ssl.key/server.key
|
||||
#SSLCertificateKeyFile /etc/httpd/conf/ssl.key/server-dsa.key
|
||||
|
||||
# Server Certificate Chain:
|
||||
# Point SSLCertificateChainFile at a file containing the
|
||||
# concatenation of PEM encoded CA certificates which form the
|
||||
# certificate chain for the server certificate. Alternatively
|
||||
# the referenced file can be the same as SSLCertificateFile
|
||||
# when the CA certificates are directly appended to the server
|
||||
# certificate for convinience.
|
||||
#SSLCertificateChainFile /etc/httpd/conf/ssl.crt/ca.crt
|
||||
|
||||
# Certificate Authority (CA):
|
||||
# Set the CA certificate verification path where to find CA
|
||||
# certificates for client authentication or alternatively one
|
||||
# huge file containing all of them (file must be PEM encoded)
|
||||
# Note: Inside SSLCACertificatePath you need hash symlinks
|
||||
# to point to the certificate files. Use the provided
|
||||
# Makefile to update the hash symlinks after changes.
|
||||
#SSLCACertificatePath /etc/httpd/conf/ssl.crt
|
||||
#SSLCACertificateFile /etc/httpd/conf/ssl.crt/ca-bundle.crt
|
||||
|
||||
# Certificate Revocation Lists (CRL):
|
||||
# Set the CA revocation path where to find CA CRLs for client
|
||||
# authentication or alternatively one huge file containing all
|
||||
# of them (file must be PEM encoded)
|
||||
# Note: Inside SSLCARevocationPath you need hash symlinks
|
||||
# to point to the certificate files. Use the provided
|
||||
# Makefile to update the hash symlinks after changes.
|
||||
#SSLCARevocationPath /etc/httpd/conf/ssl.crl
|
||||
#SSLCARevocationFile /etc/httpd/conf/ssl.crl/ca-bundle.crl
|
||||
|
||||
# Client Authentication (Type):
|
||||
# Client certificate verification type and depth. Types are
|
||||
# none, optional, require and optional_no_ca. Depth is a
|
||||
# number which specifies how deeply to verify the certificate
|
||||
# issuer chain before deciding the certificate is not valid.
|
||||
#SSLVerifyClient require
|
||||
#SSLVerifyDepth 10
|
||||
|
||||
# Access Control:
|
||||
# With SSLRequire you can do per-directory access control based
|
||||
# on arbitrary complex boolean expressions containing server
|
||||
# variable checks and other lookup directives. The syntax is a
|
||||
# mixture between C and Perl. See the mod_ssl documentation
|
||||
# for more details.
|
||||
#<Location />
|
||||
#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
|
||||
# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
|
||||
# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
|
||||
# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
|
||||
# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
|
||||
# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
|
||||
#</Location>
|
||||
|
||||
# SSL Engine Options:
|
||||
# Set various options for the SSL engine.
|
||||
# o FakeBasicAuth:
|
||||
# Translate the client X.509 into a Basic Authorisation. This means that
|
||||
# the standard Auth/DBMAuth methods can be used for access control. The
|
||||
# user name is the `one line' version of the client's X.509 certificate.
|
||||
# Note that no password is obtained from the user. Every entry in the user
|
||||
# file needs this password: `xxj31ZMTZzkVA'.
|
||||
# o ExportCertData:
|
||||
# This exports two additional environment variables: SSL_CLIENT_CERT and
|
||||
# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
|
||||
# server (always existing) and the client (only existing when client
|
||||
# authentication is used). This can be used to import the certificates
|
||||
# into CGI scripts.
|
||||
# o StdEnvVars:
|
||||
# This exports the standard SSL/TLS related `SSL_*' environment variables.
|
||||
# Per default this exportation is switched off for performance reasons,
|
||||
# because the extraction step is an expensive operation and is usually
|
||||
# useless for serving static content. So one usually enables the
|
||||
# exportation for CGI and SSI requests only.
|
||||
# o CompatEnvVars:
|
||||
# This exports obsolete environment variables for backward compatibility
|
||||
# to Apache-SSL 1.x, mod_ssl 2.0.x, Sioux 1.0 and Stronghold 2.x. Use this
|
||||
# to provide compatibility to existing CGI scripts.
|
||||
# o StrictRequire:
|
||||
# This denies access when "SSLRequireSSL" or "SSLRequire" applied even
|
||||
# under a "Satisfy any" situation, i.e. when it applies access is denied
|
||||
# and no other module can change it.
|
||||
# o OptRenegotiate:
|
||||
# This enables optimized SSL connection renegotiation handling when SSL
|
||||
# directives are used in per-directory context.
|
||||
#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
|
||||
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
|
||||
SSLOptions +StdEnvVars
|
||||
</Files>
|
||||
<Directory "/var/www/cgi-bin">
|
||||
SSLOptions +StdEnvVars
|
||||
</Directory>
|
||||
|
||||
# SSL Protocol Adjustments:
|
||||
# The safe and default but still SSL/TLS standard compliant shutdown
|
||||
# approach is that mod_ssl sends the close notify alert but doesn't wait for
|
||||
# the close notify alert from client. When you need a different shutdown
|
||||
# approach you can use one of the following variables:
|
||||
# o ssl-unclean-shutdown:
|
||||
# This forces an unclean shutdown when the connection is closed, i.e. no
|
||||
# SSL close notify alert is send or allowed to received. This violates
|
||||
# the SSL/TLS standard but is needed for some brain-dead browsers. Use
|
||||
# this when you receive I/O errors because of the standard approach where
|
||||
# mod_ssl sends the close notify alert.
|
||||
# o ssl-accurate-shutdown:
|
||||
# This forces an accurate shutdown when the connection is closed, i.e. a
|
||||
# SSL close notify alert is send and mod_ssl waits for the close notify
|
||||
# alert of the client. This is 100% SSL/TLS standard compliant, but in
|
||||
# practice often causes hanging connections with brain-dead browsers. Use
|
||||
# this only for browsers where you know that their SSL implementation
|
||||
# works correctly.
|
||||
# Notice: Most problems of broken clients are also related to the HTTP
|
||||
# keep-alive facility, so you usually additionally want to disable
|
||||
# keep-alive for those clients, too. Use variable "nokeepalive" for this.
|
||||
# Similarly, one has to force some clients to use HTTP/1.0 to workaround
|
||||
# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
|
||||
# "force-response-1.0" for this.
|
||||
SetEnvIf User-Agent ".*MSIE.*" \
|
||||
nokeepalive ssl-unclean-shutdown \
|
||||
downgrade-1.0 force-response-1.0
|
||||
|
||||
# Per-Server Logging:
|
||||
# The home of a custom SSL log file. Use this when you want a
|
||||
# compact non-error SSL logfile on a virtual host basis.
|
||||
CustomLog logs/ssl_request_log \
|
||||
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user