From e9bfb007331e190462dcbff65d3ce7a7637a3eb5 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:22:47 +0000 Subject: [PATCH] auto-import changelog data from httpd-2.0.50-6.src.rpm Sun Sep 05 2004 Joe Orton 2.0.50-6 - include /etc/sysconfig/httpd template (#112085) - pass $OPTIONS in httpd invocations in apachectl (#115910) - do not pass $OPTIONS to apachectl from init script - start httpd in C locale by default from apachectl --- httpd.init | 2 +- httpd.spec | 19 ++++++++++++++++--- httpd.sysconf | 22 ++++++++++++++++++++++ index.html | 12 ++++++------ 4 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 httpd.sysconf diff --git a/httpd.init b/httpd.init index d705aba..68f0e40 100755 --- a/httpd.init +++ b/httpd.init @@ -106,7 +106,7 @@ case "$1" in reload ;; graceful|help|configtest|fullstatus) - $apachectl $OPTIONS $@ + $apachectl $@ RETVAL=$? ;; *) diff --git a/httpd.spec b/httpd.spec index 6c66cb1..4daa6c1 100644 --- a/httpd.spec +++ b/httpd.spec @@ -1,18 +1,19 @@ %define contentdir /var/www %define suexec_caller apache %define mmn 20020903 -%define vstring Red Hat -%define distro Red Hat Enterprise Linux +%define vstring Fedora +%define distro Fedora Core Summary: Apache HTTP Server Name: httpd Version: 2.0.50 -Release: 5.ent +Release: 6 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html Source3: httpd.logrotate Source4: httpd.init +Source5: httpd.sysconf Source6: powered_by.gif Source7: powered_by_fedora.png Source8: powered_by_rh.png @@ -328,6 +329,10 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf install -m 644 $RPM_SOURCE_DIR/httpd.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf +mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -m 644 $RPM_SOURCE_DIR/httpd.sysconf \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/httpd + # mod_ssl bits for suffix in crl crt csr key prm; do mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/ssl.${suffix} @@ -518,6 +523,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/httpd/conf.d %{_sysconfdir}/httpd/conf.d/README +%config(noreplace) %{_sysconfdir}/sysconfig/httpd + %{_bindir}/ab %{_bindir}/ht* %{_bindir}/logresolve @@ -585,6 +592,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/suexec.8* %changelog +* Sun Sep 5 2004 Joe Orton 2.0.50-6 +- include /etc/sysconfig/httpd template (#112085) +- pass $OPTIONS in httpd invocations in apachectl (#115910) +- do not pass $OPTIONS to apachectl from init script +- start httpd in C locale by default from apachectl + * Wed Sep 1 2004 Joe Orton 2.0.50-5 - move manual configuration into conf.d/manual.conf (#131208) - add test_hook from HEAD, -t -DDUMP_CERTS for mod_ssl diff --git a/httpd.sysconf b/httpd.sysconf new file mode 100644 index 0000000..7102c61 --- /dev/null +++ b/httpd.sysconf @@ -0,0 +1,22 @@ +# Configuration file for the httpd service. + +# +# The default processing model (MPM) is the process-based +# 'prefork' model. A thread-based model, 'worker', is also +# available, but does not work with some modules (such as PHP). +# The service must be stopped before changing this variable. +# +#HTTPD=/usr/sbin/httpd.worker + +# +# To pass additional options (for instance, -D definitions) to the +# httpd binary at startup, set OPTIONS here. +# +#OPTIONS= + +# +# By default, the httpd process is started in the C locale; to +# change the locale in which the server runs, the HTTPD_LANG +# variable can be set. +# +#HTTPD_LANG=C diff --git a/index.html b/index.html index 7f33e0f..37d41a8 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Test Page for the Apache HTTP Server on Red Hat Enterprise Linux + Test Page for the Apache HTTP Server on Fedora Core