diff options
| author | cvsdist <cvsdist@fedoraproject.org> | 2004-09-09 06:22:47 +0000 |
|---|---|---|
| committer | cvsdist <cvsdist@fedoraproject.org> | 2004-09-09 06:22:47 +0000 |
| commit | e9bfb007331e190462dcbff65d3ce7a7637a3eb5 (patch) | |
| tree | d688e31b049d2a0f0cb08619f20141c8e4090ef0 | |
| parent | ea99b65d7f2ba184347a1ea679ac6cf9c9a5e988 (diff) | |
| download | httpd-e9bfb007331e190462dcbff65d3ce7a7637a3eb5.tar.gz httpd-e9bfb007331e190462dcbff65d3ce7a7637a3eb5.tar.xz httpd-e9bfb007331e190462dcbff65d3ce7a7637a3eb5.zip | |
auto-import changelog data from httpd-2.0.50-6.src.rpmhttpd-2_0_50-6
Sun Sep 05 2004 Joe Orton <jorton@redhat.com> 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
| -rwxr-xr-x | httpd.init | 2 | ||||
| -rw-r--r-- | httpd.spec | 19 | ||||
| -rw-r--r-- | httpd.sysconf | 22 | ||||
| -rw-r--r-- | index.html | 12 |
4 files changed, 45 insertions, 10 deletions
@@ -106,7 +106,7 @@ case "$1" in reload ;; graceful|help|configtest|fullstatus) - $apachectl $OPTIONS $@ + $apachectl $@ RETVAL=$? ;; *) @@ -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 <jorton@redhat.com> 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 <jorton@redhat.com> 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 @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> - <title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title> + <title>Test Page for the Apache HTTP Server on Fedora Core</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <style type="text/css"> /*<![CDATA[*/ @@ -27,7 +27,7 @@ text-align: center; margin: 0; padding: 0.6em 2em 0.4em; - background-color: #900; + background-color: #22437f; color: #fff; font-weight: normal; font-size: 1.75em; @@ -85,7 +85,7 @@ </head> <body> - <h1>Red Hat Enterprise Linux <strong>Test Page</strong></h1> + <h1>Fedora Core <strong>Test Page</strong></h1> <div class="content"> <div class="content-middle"> @@ -103,7 +103,7 @@ <p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p> - <p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p> + <p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p> <hr /> </div> @@ -113,9 +113,9 @@ <p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p> <div class="logos"> - <p>You are free to use the images below on Apache and Red Hat powered HTTP servers. Thanks for using Apache and Red Hat Enterprise Linux!</p> + <p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p> - <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://www.redhat.com/"><img src="/icons/powered_by_rh.png" alt="[ Powered by Red Hat ]" width="88" height="31" /></a></p> + <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p> </div> </div> </div> |