Attachment 59173 Details for Bug 93001 – apache-conf.xml.diff

[patch] apache-conf.xml.diff

apache-conf.xml.diff (text/plain), 10.67 KB, created by Jonathan Smith (RETIRED) on 2005-05-17 20:44:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Smith (RETIRED)

Created: 2005-05-17 20:44:31 UTC

Size: 10.67 KB

patch

obsolete

>--- apache-config.xml	2005-05-17 20:51:09.141707224 -0400
>+++ apache-config-new.xml	2005-05-17 23:44:37.342420208 -0400
>@@ -23,6 +23,11 @@
> <version>1.0</version>
> <date>2005-05-17</date>
> 
>+
>+
> <chapter>
> <title>Introduction</title>
> <section>
>@@ -31,28 +36,26 @@
> 
> <p>
> Apache is by far the most popular web server on the Internet. As of February 
>-2005 Netcraft has reported more than 68% of sites surveyed use Apache. Due to 
>-it's open source nature and wide popularity it stands to reason why shouldn't 
>-a guide for apache installation should be made.
>+2005, Netcraft has reported more than 68% of sites surveyed use Apache.
> </p>
> 
> <p>
> This guide is ultimately aimed at the home user who wants to put up a 
> personal webpage from home. With the widespread increase of broadband and 
>-Linux, more and more people can start putting up personal webpages for 
>+GNU/Linux, more and more people can start putting up personal webpages for 
> blogging, home-made picture albums, hobby sites, etc.
> </p>
> 
> <p>
> Average users may think operating your own HTTP server is a lot more 
>-difficult and time consuming than it really is but the truth is if you just 
>-want to host pictures of the family then it really is not difficult.
>+difficult and time consuming than it really is; the truth is if you just want
>+static content, it is not too difficult.
> </p>
> 
> <p>
>-Users should consider this guide a general, quick and easy way to get started 
>-with Apache. Full-blown websites involve a lot of work in configuring and 
>-securing but this guide will make it easy for users to get started with the 
>+Users should consider this guide a general, quick, and easy way to get started
>+with Apache. Full-blown websites involve a lot of work in configuring and
>+securing, but this guide will make it easy for users to get started with the
> basics.
> </p>
> 
>@@ -63,19 +66,16 @@
> <chapter>
> <title>Installing Apache</title>
> <section>
>-<title>Getting Started</title>
>+<title>Apache Versions</title>
> <body>
> 
> <p>
>-Fortunately, Apache is available in portage and users are urged to get the 
>-latest version available in portage so that the latest stable bug fixes and 
>-security patches are installed.
>+There are two main versions of apache currently in use - apache1 and apache2.
>+Gentoo provides ebuilds for both of these; we will be using apache2. Apache1 is
>+primarily used for situations where a special mod or very unusual config is
>+used, and we will be using neither.
> </p>
> 
>-<pre caption="Grabbing the latest version">
>-# <i>emerge sync</i>
>-</pre>
>-
> </body>
> </section>
> <section>
>@@ -84,7 +84,7 @@
> 
> <p>
> Generally, there are going to be a couple USE flags the user should be aware 
>-of before emerging Apache. Please enable the following flags that apply.
>+of before emerging Apache. Please enable the following flags as needed.
> </p>
> 
> <table>
>@@ -98,7 +98,7 @@
> </tr>
> <tr>
>   <ti>ssl</ti>
>-  <ti>Enable SSL support for webpages</ti>
>+  <ti>Enable Secure Socket Layer support for webpages</ti>
> </tr>
> <tr>
>   <ti>berkdb</ti>
>@@ -111,15 +111,16 @@
> </table>
> 
> <note>
>-If you do not know what any of the above flag descriptions are referring to 
>-then it is ok to ignore them. If at a later time the need arises for any of 
>-the above flags you can always enable the flag and re-emerge Apache.
>+If you do not know what any of the above flag descriptions are referring to,
>+then it is ok to ignore them, as you probably don't need them. If at a later
>+time the need arises for any of the above flags you can always enable the flag
>+and re-emerge Apache.
> </note>
> 
>-<p>
>-Please add the appropiate USE flags to your <path>/etc/make.conf</path> file 
>-under the USE category.
>-</p>
>+<pre caption="Editing /etc/make.conf">
>+<comment>(Add the following, as needed)</comment>
>+USE="ipv6 ssl berkdb ldap"
>+</pre>
> 
> </body>
> </section>
>@@ -129,8 +130,8 @@
> 
> <p>
> Compile time will vary from system to system but if you need a general 
>-estimate on compile time, an AMD 1.33Ghz Thunderbird with 512mb of RAM takes 
>-about 10 min.
>+estimate on compile time, an AMD 1.33Ghz t-bird with 512mb of RAM takes about
>+10 min.
> </p>
> 
> <pre caption="Emerging Apache">
>@@ -148,9 +149,9 @@
> <body>
> 
> <p>
>-After Apache has been emerged the user should be made aware of how to 
>-configure the Apache server. In this Chapter basic configuration options 
>-will be given. The main configuration file is located at <path>/etc/apache2/conf/apache2.conf</path>.
>+In this Chapter, basic configuration options will be given. The main
>+configuration file is located at <path>/etc/apache2/conf/apache2.conf</path>.
>+All of the following modifications will be made in that file!
> </p>
> 
> <p>The first thing users will want to do is to select an IP address and Port 
>@@ -160,19 +161,24 @@
> <note>Selecting an IP and Port for Apache to listen on is called Binding.</note>
> 
> <pre caption="Configuring which IP/Port to Listen on">
>-<comment># The listen directive is what is used to choose IP/Port.</comment>
>-<comment># Most users only have 1 IP address on their computer so the only</comment>
>-<comment># thing that needs to be set is the Port. The following will set</comment>
>-<comment># Apache to listen in on Port 80. There is no need to specify</comment>
>-<comment># an IP address since there is only 1 available on the computer.</comment>
>+<comment>
>+# The listen directive is what is used to choose IP/Port. Most users only have
>+# 1 IP address on their computer so the only thing that needs to be set is the
>+# Port. The following will set Apache to listen in on Port 80. There is no need
>+# to specify an IP address since there is only 1 available on the computer.
>+</comment>
> Listen 80
> 
>-<comment># If the user would like Apache to listen on another port in addition</comment>
>-<comment># to port 80 then add another Listen line. Apache now listens on</comment>
>-<comment># Port 8000 and Port 80 if the user kept both lines in the config.</comment>
>+<comment>
>+# If the user would like Apache to listen on another port in addition to port
>+# 80 then add another Listen line. Apache now listens on Port 8000 and Port 80
>+# if the user kept both lines in the config.
>+</comment>
> Listen 8000
> 
>-<comment># If users have multiple IPs then the following syntax can be used.</comment>
>+<comment>
>+# If users have multiple IPs then the following syntax can be used.
>+</comment>
> Listen 192.168.0.20:80
> Listen 192.168.0.150:8000
> </pre>
>@@ -189,11 +195,15 @@
> </p>
> 
> <pre caption="Setting HTTP file location">
>-<comment># This is the default location in the config file</comment>
>+<comment>
>+# This is the default location in the config file
>+</comment>
> DocumentRoot /var/www/localhost/htdocs
> 
>-<comment># The location could be changed to a directory located in a user's</comment>
>-<comment># home directory as follows.</comment>
>+<comment>
>+# The location could be changed to a directory located in a user's home
>+# directory as follows.
>+</comment>
> DocumentRoot /home/user/www
> </pre>
> 
>@@ -204,8 +214,8 @@
> <body>
> 
> <p>
>-If the user would like Apache to startup each time the Linux system is brought 
>-up then adding Apache to the runlevel is needed.
>+If the user would like Apache to startup each time the Gentoo system is brought
>+up, adding Apache to the runlevel is needed.
> </p>
> 
> <pre caption="Adding Apache to startup">
>@@ -219,17 +229,17 @@
> <body>
> 
> <p>
>-By now the user has the very basics setup for Apache and now all that is 
>-needed is for the user to add whatever files he or she chooses. The document 
>-root for all Apache files is located at <path>/var/www/localhost/htdocs</path> 
>-if the user kept the default path location mentioned in this guide.
>+By now the user has very basic setup for Apache and now all that is  needed is
>+for the user to add whatever files he or she chooses. The document  root for
>+all Apache files is located at <path>/var/www/localhost/htdocs</path>  if the
>+user kept the default path location mentioned in this guide.
> </p>
> 
> <p>
>-For now the user does not have to place anything in the DocumentRoot location. 
>-HTTP related files can be inserted whenever but for now the default files at 
>-<path>/var/www/localhost/htdocs</path> are more than enough to get an idea 
>-of how to start.
>+For now, the user does not have to place anything in the DocumentRoot location. 
>+HTTP related files can be inserted whenever, but the default files at
>+<path>/var/www/localhost/htdocs</path> are more than enough to get an idea of
>+how to start.
> </p>
> 
> </body>
>@@ -246,9 +256,9 @@
> # <i>/etc/init.d/apache2 start</i>
> </pre>
> 
>-<p>
>+<note>
> Apache can just as easily be brought down with the following command.
>-</p>
>+</note>
> 
> <pre caption="Stopping Apache">
> # <i>/etc/init.d/apache2 stop</i>
>@@ -267,14 +277,16 @@
> </p>
> 
> <p>
>-Users should open up their favorite browser and enter in 127.0.0.1 into the 
>-browser address. The browser should immediately load a default page stating 
>-in the first sentence that the installation of the Apache web server is a 
>+Users should open up their favorite browser and enter in <c>127.0.0.1</c> as
>+the browser address. The browser should immediately load a default page stating
>+in the first sentence that the installation of the Apache web server is a
> success.
> </p>
> 
>-<note>The user can also enter in their IP as listed in ifconfig usually on 
>-eth0. </note>
>+<note>
>+The user can also enter in their IP as listed in ifconfig; this is usually
>+eth0.
>+</note>
> 
> </body>
> </section>
>@@ -285,18 +297,20 @@
> <p>
> If the user would like to setup an Apache server for testing and would like 
> to restrict access to just the local computer it can easily be done by using 
>-the Listen directive in the apache2.conf.
>+the Listen directive in the <path>apache2.conf</path>.
> </p>
> 
> <pre caption="Restricting Access to localhost only">
>-<comment># 127.0.0.1 is the local loopback address to your computer</comment>
>+<comment>
>+# 127.0.0.1 is the local loopback address to your computer
>+</comment>
> Listen 127.0.0.1:80
> </pre>
> 
> </body>
> </section>
> <section>
>-<title>Keeping track of your Apache</title>
>+<title>Keeping track of Apache</title>
> <body>
> 
> <p>
>@@ -345,11 +359,10 @@
> </table>
> 
> <p>
>-To actively monitor the Apache log file on say a desktop, users can use a 
>-xterm and execute the following command.
>+To actively monitor the Apache log file, execute the following command:
> </p>
> 
>-<pre caption="Using a Xterm to monitor the Apache log">
>+<pre caption="Monitoring the Apache log">
> # <i>tail -f /var/log/apache2/error_log</i>
> </pre>
> 
>@@ -360,12 +373,7 @@
> <body>
> 
> <p>
>-Congratulations to the user for a painless quick start on Apache.
>-</p>
>-
>-<p>
>-Users are encouraged to check back on this guide for more updates concerning 
>-Apache user and configuration. Possible future content include a FAQ.
>+Congratulations for a painless quick start on Apache.
> </p>
> 
> <p>

Actions: View | Diff

Attachments on bug 93001: 59161 | 59172 | 59173 | 59206 | 59306