From c2edc0550ec598791f99c6b37744ce3ff66182a0 Mon Sep 17 00:00:00 2001 From: Sameer Parekh Date: Sat, 25 Oct 1997 22:35:13 +0000 Subject: [PATCH] Set default pathnames -everywhere- to /usr/local/apache PR: Obtained from: Submitted by: Sameer Parekh Reviewed by: Jim, Martin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@79464 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/install.html | 2 +- docs/manual/install.html.en | 2 +- docs/manual/invoking.html | 2 +- docs/manual/invoking.html.en | 2 +- docs/manual/misc/FAQ.html | 6 +++--- docs/manual/mod/core.html | 4 ++-- docs/manual/mod/mod_alias.html | 6 +++--- docs/manual/stopping.html | 4 ++-- docs/manual/stopping.html.en | 4 ++-- docs/manual/suexec.html | 12 ++++++------ docs/manual/suexec.html.en | 12 ++++++------ 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/manual/install.html b/docs/manual/install.html index 38e14980b7..99d4fe3953 100644 --- a/docs/manual/install.html +++ b/docs/manual/install.html @@ -164,7 +164,7 @@ files in directories accessed by the server. To start the server, simply run httpd. This will look for httpd.conf in the location compiled into the code (by -default /usr/local/etc/httpd/conf/httpd.conf). If +default /usr/local/apache/conf/httpd.conf). If this file is somewhere else, you can give the real location with the -f argument. For example: diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 38e14980b7..99d4fe3953 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -164,7 +164,7 @@ files in directories accessed by the server. To start the server, simply run httpd. This will look for httpd.conf in the location compiled into the code (by -default /usr/local/etc/httpd/conf/httpd.conf). If +default /usr/local/apache/conf/httpd.conf). If this file is somewhere else, you can give the real location with the -f argument. For example: diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html index 48e08f782a..669b359f66 100644 --- a/docs/manual/invoking.html +++ b/docs/manual/invoking.html @@ -30,7 +30,7 @@ The following options are recognized on the httpd command line:
Set the initial value for the ServerRoot variable to serverroot. This can be overridden by the ServerRoot command in the -configuration file. The default is /usr/local/etc/httpd. +configuration file. The default is /usr/local/apache.
-f config
Execute the commands in the file config on startup. If diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en index 48e08f782a..669b359f66 100644 --- a/docs/manual/invoking.html.en +++ b/docs/manual/invoking.html.en @@ -30,7 +30,7 @@ The following options are recognized on the httpd command line:
Set the initial value for the ServerRoot variable to serverroot. This can be overridden by the ServerRoot command in the -configuration file. The default is /usr/local/etc/httpd. +configuration file. The default is /usr/local/apache.
-f config
Execute the commands in the file config on startup. If diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html index eae5eaa38f..5699ca0257 100644 --- a/docs/manual/misc/FAQ.html +++ b/docs/manual/misc/FAQ.html @@ -15,7 +15,7 @@

Apache Server Frequently Asked Questions

- $Revision: 1.90 $ ($Date: 1997/10/21 01:10:27 $) + $Revision: 1.91 $ ($Date: 1997/10/25 22:35:10 $)

The latest version of this FAQ is always available from the main @@ -457,7 +457,7 @@ the server error log. Sometimes this is enough for you to diagnose & fix the problem yourself (such as file permissions or the like). The default location of the error log is - /usr/local/etc/httpd/logs/error_log, but see the + /usr/local/apache/logs/error_log, but see the ErrorLog @@ -1731,7 +1731,7 @@
AuthType Basic
- AuthUserFile /usr/local/etc/httpd/conf/htpasswd.users + AuthUserFile /usr/local/apache/conf/htpasswd.users
AuthName special directory
diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index 05068fab53..0f1ff5f208 100644 --- a/docs/manual/mod/core.html +++ b/docs/manual/mod/core.html @@ -488,7 +488,7 @@ different sections are combined when a request is received Syntax: DocumentRoot directory-filename
Default: DocumentRoot -/usr/local/etc/httpd/htdocs
+/usr/local/apache/htdocs
Context: server config, virtual host
Status: core

@@ -1530,7 +1530,7 @@ use with Host-header based virtual hosts.

ServerRoot directive

Syntax: ServerRoot directory-filename
-Default: ServerRoot /usr/local/etc/httpd
+Default: ServerRoot /usr/local/apache
Context: server config
Status: core

diff --git a/docs/manual/mod/mod_alias.html b/docs/manual/mod/mod_alias.html index 484c2b8352..7954c8e492 100644 --- a/docs/manual/mod/mod_alias.html +++ b/docs/manual/mod/mod_alias.html @@ -59,7 +59,7 @@ return the file /ftp/pub/image/foo.gif.

Note that if you include a trailing / on the url-path then the server will require a trailing / in order to expand the alias. That is, -if you use Alias /icons/ /usr/local/etc/httpd/icons/ then +if you use Alias /icons/ /usr/local/apache/icons/ then the url /icons will not be aliased.

@@ -83,7 +83,7 @@ and if it matches, the server will substitute any parenthesized matches into the given string and use it as a filename. For example, to activate the /icons directory, one might use: 

-    AliasMatch ^/icons(.*) /usr/local/etc/httpd/icons$1
+    AliasMatch ^/icons(.*) /usr/local/apache/icons$1

@@ -248,7 +248,7 @@ and if it matches, the server will substitute any parenthesized matches into the given string and use it as a filename. For example, to activate the standard /cgi-bin, one might use: 
-    ScriptAlias ^/cgi-bin(.*) /usr/local/etc/httpd/cgi-bin$1
+    ScriptAlias ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1

diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html index 373590a311..673d81beb3 100644 --- a/docs/manual/stopping.html +++ b/docs/manual/stopping.html @@ -25,13 +25,13 @@ be described in a moment.

To send a signal to the parent you should issue a command such as: 

-    kill -TERM `cat /usr/local/etc/httpd/logs/httpd.pid`
+    kill -TERM `cat /usr/local/apache/logs/httpd.pid`
You can read about its progress by issuing: 
-    tail -f /usr/local/etc/httpd/logs/error_log
+    tail -f /usr/local/apache/logs/error_log
Modify those examples to match your diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en index 373590a311..673d81beb3 100644 --- a/docs/manual/stopping.html.en +++ b/docs/manual/stopping.html.en @@ -25,13 +25,13 @@ be described in a moment.

To send a signal to the parent you should issue a command such as: 

-    kill -TERM `cat /usr/local/etc/httpd/logs/httpd.pid`
+    kill -TERM `cat /usr/local/apache/logs/httpd.pid`
You can read about its progress by issuing: 
-    tail -f /usr/local/etc/httpd/logs/error_log
+    tail -f /usr/local/apache/logs/error_log
Modify those examples to match your diff --git a/docs/manual/suexec.html b/docs/manual/suexec.html index 6eb3a93e19..90af9ad117 100644 --- a/docs/manual/suexec.html +++ b/docs/manual/suexec.html @@ -326,14 +326,14 @@ match your local Apache installation. * transactions and errors logged for auditing and * debugging purposes. */ - #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */ + #define LOG_EXEC "/usr/local/apache/logs/cgi.log" /* Need me? */ /* * DOC_ROOT -- Define as the DocumentRoot set for Apache. This * will be the only hierarchy (aside from UserDirs) * that can be used for suEXEC behavior. */ - #define DOC_ROOT "/usr/local/etc/httpd/htdocs" + #define DOC_ROOT "/usr/local/apache/htdocs" /* * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables. @@ -360,7 +360,7 @@ location. From src/httpd.h 
      /* The path to the suEXEC wrapper */
-     #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
+     #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"

@@ -378,7 +378,7 @@ exercise above to the defined location for SUEXEC_BIN.

-cp suexec /usr/local/etc/httpd/sbin/suexec [ENTER] +cp suexec /usr/local/apache/sbin/suexec [ENTER]

@@ -389,8 +389,8 @@ user shell, do so now and execute the following commands.

-chown root /usr/local/etc/httpd/sbin/suexec [ENTER]
-chmod 4711 /usr/local/etc/httpd/sbin/suexec [ENTER] +chown root /usr/local/apache/sbin/suexec [ENTER]
+chmod 4711 /usr/local/apache/sbin/suexec [ENTER]

diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en index 6eb3a93e19..90af9ad117 100644 --- a/docs/manual/suexec.html.en +++ b/docs/manual/suexec.html.en @@ -326,14 +326,14 @@ match your local Apache installation. * transactions and errors logged for auditing and * debugging purposes. */ - #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */ + #define LOG_EXEC "/usr/local/apache/logs/cgi.log" /* Need me? */ /* * DOC_ROOT -- Define as the DocumentRoot set for Apache. This * will be the only hierarchy (aside from UserDirs) * that can be used for suEXEC behavior. */ - #define DOC_ROOT "/usr/local/etc/httpd/htdocs" + #define DOC_ROOT "/usr/local/apache/htdocs" /* * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables. @@ -360,7 +360,7 @@ location. From src/httpd.h 

      /* The path to the suEXEC wrapper */
-     #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
+     #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"

@@ -378,7 +378,7 @@ exercise above to the defined location for SUEXEC_BIN.

-cp suexec /usr/local/etc/httpd/sbin/suexec [ENTER] +cp suexec /usr/local/apache/sbin/suexec [ENTER]

@@ -389,8 +389,8 @@ user shell, do so now and execute the following commands.

-chown root /usr/local/etc/httpd/sbin/suexec [ENTER]
-chmod 4711 /usr/local/etc/httpd/sbin/suexec [ENTER] +chown root /usr/local/apache/sbin/suexec [ENTER]
+chmod 4711 /usr/local/apache/sbin/suexec [ENTER]

-- 2.40.0