rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Require: apr-util-ldap (#471898)

Browse Source 
- init script changes: pass pidfile to status(), use status() in
    condrestart (#480602), support try-restart as alias for condrestart
- change /etc/httpd/run symlink to have destination /var/run/httpd, and
    restore "run/httpd.conf" as default PidFile (#478688)
This commit is contained in:
jorton 2009-01-22 14:49:56 +00:00
parent 8ba10d875d
commit f47f283dc0
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpd.conf
View File

@ -60,7 +60,7 @@ ServerRoot "/etc/httpd"
# PidFile: The file in which the server should record its process # PidFile: The file in which the server should record its process
# identification number when it starts. # identification number when it starts.
# #
PidFile run/httpd/httpd.pid PidFile run/httpd.pid
# #
# Timeout: The number of seconds before receives and sends time out. # Timeout: The number of seconds before receives and sends time out.

6
httpd.init
View File

@ -91,15 +91,15 @@ case "$1" in
stop stop
;; ;;
status) status)
status $httpd status -p ${pidfile} $httpd
RETVAL=$? RETVAL=$?
;; ;;
restart) restart)
stop stop
start start
;; ;;
condrestart) condrestart|try-restart)
if [ -f ${pidfile} ] ; then if status -p ${pidfile} $httpd >&/dev/null; then
stop stop
start start
fi fi

14
httpd.spec
View File

@ -7,7 +7,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.2.11 Version: 2.2.11
Release: 5 Release: 6
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
@ -54,7 +54,7 @@ Provides: httpd-mmn = %{mmn}
Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
Obsoletes: stronghold-htdocs, mod_put, mod_roaming Obsoletes: stronghold-htdocs, mod_put, mod_roaming
Conflicts: pcre < 4.0 Conflicts: pcre < 4.0
Requires: httpd-tools = %{version}-%{release} Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
%description %description
The Apache HTTP Server is a powerful, efficient, and extensible The Apache HTTP Server is a powerful, efficient, and extensible
@ -288,7 +288,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/httpd
# symlinks for /etc/httpd # symlinks for /etc/httpd
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run ln -s ../..%{_localstatedir}/run/httpd $RPM_BUILD_ROOT/etc/httpd/run
ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
# install SYSV init stuff # install SYSV init stuff
@ -482,6 +482,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh %{_libdir}/httpd/build/*.sh
%changelog %changelog
* Thu Jan 22 2009 Joe Orton <jorton@redhat.com> 2.2.11-6
- Require: apr-util-ldap (#471898)
- init script changes: pass pidfile to status(), use status() in
condrestart (#480602), support try-restart as alias for
condrestart
- change /etc/httpd/run symlink to have destination /var/run/httpd,
and restore "run/httpd.conf" as default PidFile (#478688)
* Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> 2.2.11-5 * Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> 2.2.11-5
- rebuild with new openssl - rebuild with new openssl