diff options
author | Graham Leggett <minfrin@apache.org> | 2011-12-18 20:29:23 +0000 |
---|---|---|
committer | Graham Leggett <minfrin@apache.org> | 2011-12-18 20:29:23 +0000 |
commit | ac5e35b7485f23f18731182291f3899a64ab2949 (patch) | |
tree | 0aa12530d7dd1b2f8b2b1afa6ee217a454bacd54 | |
parent | fc7ff6fb2c7ab3b84c717fc06a03b5bbeaae1623 (diff) | |
download | httpd-ac5e35b7485f23f18731182291f3899a64ab2949.tar.gz |
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1220530 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/index.html.en | 1 | ||||
-rw-r--r-- | docs/manual/index.xml.da | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.de | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.es | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.pt-br | 2 | ||||
-rw-r--r-- | docs/manual/index.xml.tr | 2 | ||||
-rw-r--r-- | docs/manual/new_features_2_4.html.en | 6 | ||||
-rw-r--r-- | docs/manual/platform/index.html.en | 23 | ||||
-rw-r--r-- | docs/manual/platform/index.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/platform/index.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/platform/rpm.html | 5 | ||||
-rw-r--r-- | docs/manual/platform/rpm.html.en | 205 | ||||
-rw-r--r-- | docs/manual/platform/rpm.xml.meta | 12 |
16 files changed, 257 insertions, 15 deletions
diff --git a/docs/manual/index.html.en b/docs/manual/index.html.en index 8442ee93ae..9f757296b5 100644 --- a/docs/manual/index.html.en +++ b/docs/manual/index.html.en @@ -84,6 +84,7 @@ Documentation</h1> </ul> </div><div class="category"><h2><a name="platform" id="platform">Platform Specific Notes</a></h2> <ul><li><a href="platform/windows.html">Microsoft Windows</a></li> +<li><a href="platform/rpm.html">RPM-based Systems (Redhat / CentOS / Fedora)</a></li> <li><a href="platform/netware.html">Novell NetWare</a></li> <li><a href="platform/ebcdic.html">EBCDIC Port</a></li> </ul> diff --git a/docs/manual/index.xml.da b/docs/manual/index.xml.da index 4b2289446b..a6f9a4cbbf 100644 --- a/docs/manual/index.xml.da +++ b/docs/manual/index.xml.da @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?> -<!-- English Revision: 959136:1174747 (outdated) --> +<!-- English Revision: 959136:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de index 6d65f2b537..02b52b70ec 100644 --- a/docs/manual/index.xml.de +++ b/docs/manual/index.xml.de @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?> -<!-- English Revision: 1050960:1174747 (outdated) --> +<!-- English Revision: 1050960:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/index.xml.es b/docs/manual/index.xml.es index 2d5768d9ef..2cfe82a405 100644 --- a/docs/manual/index.xml.es +++ b/docs/manual/index.xml.es @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?> -<!-- English Revision: 105989:1174747 (outdated) --> +<!-- English Revision: 105989:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja index 2c8d9bcf77..2195435621 100644 --- a/docs/manual/index.xml.ja +++ b/docs/manual/index.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?> -<!-- English Revision: 636028:1174747 (outdated) --> +<!-- English Revision: 636028:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko index d19b26cf35..233692940b 100644 --- a/docs/manual/index.xml.ko +++ b/docs/manual/index.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?> -<!-- English Revision: 105989:1174747 (outdated) --> +<!-- English Revision: 105989:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/index.xml.meta b/docs/manual/index.xml.meta index 4a81cf2763..b1118d585f 100644 --- a/docs/manual/index.xml.meta +++ b/docs/manual/index.xml.meta @@ -15,7 +15,7 @@ <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> <variant outdated="yes">pt-br</variant> - <variant>tr</variant> + <variant outdated="yes">tr</variant> <variant>zh-cn</variant> </variants> </metafile> diff --git a/docs/manual/index.xml.pt-br b/docs/manual/index.xml.pt-br index 8d9d164d40..497386cac1 100644 --- a/docs/manual/index.xml.pt-br +++ b/docs/manual/index.xml.pt-br @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?> -<!-- English Revision: 420993:1174747 (outdated) --> +<!-- English Revision: 420993:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/index.xml.tr b/docs/manual/index.xml.tr index 20a8e628ed..b2f4589234 100644 --- a/docs/manual/index.xml.tr +++ b/docs/manual/index.xml.tr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?> -<!-- English Revision: 1174747 --> +<!-- English Revision: 1174747:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en index 9ce3f31fbe..386f51c9ec 100644 --- a/docs/manual/new_features_2_4.html.en +++ b/docs/manual/new_features_2_4.html.en @@ -19,7 +19,8 @@ <a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="./">Version 2.4</a></div><div id="page-content"><div id="preamble"><h1>Overview of new features in Apache HTTP Server 2.4</h1> <div class="toplang"> <p><span>Available Languages: </span><a href="./en/new_features_2_4.html" title="English"> en </a> | -<a href="./fr/new_features_2_4.html" hreflang="fr" rel="alternate" title="Français"> fr </a></p> +<a href="./fr/new_features_2_4.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | +<a href="./tr/new_features_2_4.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p> </div> <p>This document describes some of the major changes between the @@ -319,7 +320,8 @@ </div></div> <div class="bottomlang"> <p><span>Available Languages: </span><a href="./en/new_features_2_4.html" title="English"> en </a> | -<a href="./fr/new_features_2_4.html" hreflang="fr" rel="alternate" title="Français"> fr </a></p> +<a href="./fr/new_features_2_4.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | +<a href="./tr/new_features_2_4.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p> </div><div id="footer"> <p class="apache">Copyright 2011 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div> diff --git a/docs/manual/platform/index.html.en b/docs/manual/platform/index.html.en index 2445c38e9a..a3124de265 100644 --- a/docs/manual/platform/index.html.en +++ b/docs/manual/platform/index.html.en @@ -24,6 +24,7 @@ </div> </div> <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#win">Microsoft Windows</a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#unix">Unix Systems</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#other">Other Platforms</a></li> </ul></div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -35,7 +36,7 @@ <dl> <dt>Using Apache</dt> <dd> - <p>This document explains how to install, configure and run Apache 2.0 + <p>This document explains how to install, configure and run Apache 2.4 under Microsoft Windows.</p> <p>See: <a href="windows.html">Using Apache with Microsoft Windows</a></p> @@ -54,6 +55,22 @@ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> +<h2><a name="unix" id="unix">Unix Systems</a></h2> + + + + <dl> + <dt>RPM Based Systems (Redhat / CentOS / Fedora)</dt> + <dd> + <p>This document explains how to build, install, and run Apache 2.4 + on systems supporting the RPM packaging format.</p> + + <p>See: <a href="rpm.html">Using Apache With RPM Based Systems</a></p> + </dd> + </dl> + + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> +<div class="section"> <h2><a name="other" id="other">Other Platforms</a></h2> @@ -61,7 +78,7 @@ <dl> <dt>Novell NetWare</dt> <dd> - <p>This document explains how to install, configure and run Apache 2.0 + <p>This document explains how to install, configure and run Apache 2.4 under Novell NetWare 5.1 and above.</p> <p>See: <a href="netware.html">Using Apache With Novell NetWare</a></p> @@ -77,7 +94,7 @@ <div class="warning"><strong>Warning:</strong> This document has not been updated to take into account changes made in - the 2.0 version of the Apache HTTP Server. Some of the + the 2.4 version of the Apache HTTP Server. Some of the information may still be relevant, but please use it with care.</div> diff --git a/docs/manual/platform/index.xml.ko b/docs/manual/platform/index.xml.ko index 3295fd7351..dab05035dd 100644 --- a/docs/manual/platform/index.xml.ko +++ b/docs/manual/platform/index.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 420990 --> +<!-- English Revision: 420990:1220529 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/platform/index.xml.meta b/docs/manual/platform/index.xml.meta index 3070356f99..1ac8ab1fa4 100644 --- a/docs/manual/platform/index.xml.meta +++ b/docs/manual/platform/index.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>ko</variant> + <variant outdated="yes">ko</variant> <variant>zh-cn</variant> </variants> </metafile> diff --git a/docs/manual/platform/rpm.html b/docs/manual/platform/rpm.html new file mode 100644 index 0000000000..8776009a2e --- /dev/null +++ b/docs/manual/platform/rpm.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: rpm.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/platform/rpm.html.en b/docs/manual/platform/rpm.html.en new file mode 100644 index 0000000000..a195b65605 --- /dev/null +++ b/docs/manual/platform/rpm.html.en @@ -0,0 +1,205 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!-- + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + This file is generated from xml source: DO NOT EDIT + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + --> +<title>Using Apache With RPM Based Systems (Redhat / CentOS / Fedora) - Apache HTTP Server</title> +<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /> +<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /> +<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /> +<link href="../images/favicon.ico" rel="shortcut icon" /></head> +<body id="manual-page"><div id="page-header"> +<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p> +<p class="apache">Apache HTTP Server Version 2.4</p> +<img alt="" src="../images/feather.gif" /></div> +<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div> +<div id="path"> +<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache With RPM Based Systems (Redhat / CentOS / Fedora)</h1> +<div class="toplang"> +<p><span>Available Languages: </span><a href="../en/platform/rpm.html" title="English"> en </a></p> +</div> + + + <p>This document explains how to build, install, configure and run + Apache 2.4 under Unix systems supporting the RPM packaging format.</p> + + </div> +<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#creating">Creating a Source RPM</a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#building">Building RPMs</a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#installing">Installing the Server</a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#default">Configuring the Default Instance of Apache httpd</a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#additional">Configuring Additional Instances of Apache httpd on the Same Machine</a></li> +</ul></div> +<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> +<div class="section"> +<h2><a name="creating" id="creating">Creating a Source RPM</a></h2> + + + <p>The Apache httpd source tarball can be converted into an SRPM as + follows:</p> + + <div class="example"><p><code> + rpmbuild -ts httpd-2.4.x.tar.bz2 + </code></p></div> + + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> +<div class="section"> +<h2><a name="building" id="building">Building RPMs</a></h2> + + + <p>RPMs can be built directly from the Apache httpd source tarballs using + the following command:</p> + + <div class="example"><p><code> + rpmbuild -tb httpd-2.4.x.tar.bz2 + </code></p></div> + + <p>If successful, the following RPMs will be created:</p> + + <dl> + <dt>httpd-2.4.x-1.i686.rpm</dt> + <dd>The core server and basic module set.</dd> + + <dt>httpd-debuginfo-2.4.x-1.i686.rpm</dt> + <dd>Debugging symbols for the server and all modules.</dd> + + <dt>httpd-devel-2.4.x-1.i686.rpm</dt> + <dd>Headers and development files for the server.</dd> + + <dt>httpd-manual-2.4.x-1.i686.rpm</dt> + <dd>The webserver manual.</dd> + + <dt>httpd-tools-2.4.x-1.i686.rpm</dt> + <dd>Supporting tools for the webserver.</dd> + + <dt>mod_authnz_ldap-2.4.x-1.i686.rpm</dt> + <dd><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> and <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>, with + corresponding dependency on openldap.</dd> + + <dt>mod_lua-2.4.x-1.i686.rpm</dt> + <dd><code class="module"><a href="../mod/mod_lua.html">mod_lua</a></code> module, with + corresponding dependency on lua.</dd> + + <dt>mod_proxy_html-2.4.x-1.i686.rpm</dt> + <dd><code class="module"><a href="../mod/mod_proxy_html.html">mod_proxy_html</a></code> module, with + corresponding dependency on libxml2.</dd> + + <dt>mod_socache_dc-2.4.x-1.i686.rpm</dt> + <dd><code class="module"><a href="../mod/mod_socache_dc.html">mod_socache_dc</a></code> module, with + corresponding dependency on distcache.</dd> + + <dt>mod_ssl-2.4.x-1.i686.rpm</dt> + <dd><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> module, with + corresponding dependency on openssl.</dd> + + </dl> + + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> +<div class="section"> +<h2><a name="installing" id="installing">Installing the Server</a></h2> + + + <p>The <code>httpd</code> RPM is the only RPM necessary to get a basic + server to run. Install it as follows:</p> + + <div class="example"><p><code> + rpm -U httpd-2.4.x-1.i686.rpm + </code></p></div> + + <p>Self contained modules are included with the server. Modules that + depend on external libraries are provided as separate RPMs to install + if needed.</p> + + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> +<div class="section"> +<h2><a name="default" id="default">Configuring the Default Instance of Apache httpd</a></h2> + + + <p>The default configuration for the server is installed by default + beneath the <code>/etc/httpd</code> directory, with logs written by + default to <code>/var/log/httpd</code>. The environment for the + webserver is set by default within the optional + <code>/etc/sysconfig/httpd</code> file.</p> + + <p>Start the server as follows:</p> + + <div class="example"><p><code> + service httpd restart + </code></p></div> + + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> +<div class="section"> +<h2><a name="additional" id="additional">Configuring Additional Instances of Apache httpd on the Same Machine</a></h2> + + + <p>It is possible to configure additional instances of the Apache + httpd server running independently alongside each other on the same + machine. These instances can have independent configurations, and + can potentially run as separate users if so configured.</p> + + <p>This was done by making the httpd startup script aware of its own + name. This name is then used to find the environment file for the + server, and in turn, the server root of the server instance.</p> + + <p>To create an additional instance called + <code>httpd-additional</code>, follow these steps:</p> + + <ul> + <li>Create a symbolic link to the startup script for the additional + server: + + <div class="example"><p><code> + ln -s /etc/rc.d/init.d/httpd /etc/rc.d/init.d/httpd-additional<br /> + chkconfig --add httpd-additional + </code></p></div> + + </li> + + <li>Create an environment file for the server, using the + <code>/etc/sysconfig/httpd</code> file as a template: + + <div class="example"><p><code> + # template from httpd<br /> + cp /etc/sysconfig/httpd /etc/sysconfig/httpd-additional + </code></p></div> + + <div class="example"><p><code> + # blank template<br /> + touch /etc/sysconfig/httpd-additional + </code></p></div> + + Edit <code>/etc/sysconfig/httpd-additional</code> and pass the + server root of the new server instance within the + <code>OPTIONS</code> environment variable. + + <div class="example"><p><code> + OPTIONS="-d /etc/httpd-additional -f conf/httpd-additional.conf" + </code></p></div> + + </li> + + <li>Edit the server configuration file + <code>/etc/httpd-additional/conf/httpd-additional.conf</code> to + ensure the correct ports and paths are configured. + </li> + + <li>Start the server as follows: + + <div class="example"><p><code> + service httpd-additional restart + </code></p></div> + + </li> + + <li>Repeat this process as required for each server instance.</li> + </ul> + + </div></div> +<div class="bottomlang"> +<p><span>Available Languages: </span><a href="../en/platform/rpm.html" title="English"> en </a></p> +</div><div id="footer"> +<p class="apache">Copyright 2011 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> +<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div> +</body></html>
\ No newline at end of file diff --git a/docs/manual/platform/rpm.xml.meta b/docs/manual/platform/rpm.xml.meta new file mode 100644 index 0000000000..bf85489f9a --- /dev/null +++ b/docs/manual/platform/rpm.xml.meta @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- GENERATED FROM XML: DO NOT EDIT --> + +<metafile reference="rpm.xml"> + <basename>rpm</basename> + <path>/platform/</path> + <relpath>..</relpath> + + <variants> + <variant>en</variant> + </variants> +</metafile> |