sameer 97/10/25 15:35:21
Modified: . README.NT
conf httpd.conf-dist-win
htdocs/manual install.html invoking.html stopping.html
suexec.html
htdocs/manual/misc FAQ.html
htdocs/manual/mod core.html mod_alias.html
src CHANGES
src/main httpd.h
src/modules/standard mod_cgi.c
src/support apachectl httpd.8 suexec.h
Log:
Set default pathnames -everywhere- to /usr/local/apache
Submitted by: Sameer Parekh
Reviewed by: Jim, Martin
Revision Changes Path
1.7 +1 -1 apachen/README.NT
Index: README.NT
===================================================================
RCS file: /export/home/cvs/apachen/README.NT,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -u -r1.6 -r1.7
/usr/bin/diff: conflicting specifications of output style
--- README.NT 1997/10/22 13:30:02 1.6
+++ README.NT 1997/10/25 22:35:05 1.7
@@ -55,7 +55,7 @@
Due to the behavior of NT when multiple processes have a socket open
for listening, I would recommend that you set the following in httpd.conf
-(in the directory /usr/local/etc/httpd/conf):
+(in the directory /usr/local/apache/conf):
# Start up 3 servers (in case one dies, another can take its place, while
# a new one is spawned
1.6 +1 -1 apachen/conf/httpd.conf-dist-win
Index: httpd.conf-dist-win
===================================================================
RCS file: /export/home/cvs/apachen/conf/httpd.conf-dist-win,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -u -r1.5 -r1.6
/usr/bin/diff: conflicting specifications of output style
--- httpd.conf-dist-win 1997/10/25 19:10:10 1.5
+++ httpd.conf-dist-win 1997/10/25 22:35:06 1.6
@@ -135,7 +135,7 @@
# To enable the cache as well, edit and uncomment the following lines:
-#CacheRoot /usr/local/etc/httpd/proxy
+#CacheRoot /usr/local/apache/proxy
#CacheSize 5
#CacheGcInterval 4
#CacheMaxExpire 24
1.15 +1 -1 apachen/htdocs/manual/install.html
Index: install.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/install.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -u -r1.14 -r1.15
/usr/bin/diff: conflicting specifications of output style
--- install.html 1997/08/24 12:55:09 1.14
+++ install.html 1997/10/25 22:35:07 1.15
@@ -164,7 +164,7 @@
To start the server, simply run <CODE>httpd</CODE>. This will look for
<CODE>httpd.conf</CODE> in the location compiled into the code (by
-default <CODE>/usr/local/etc/httpd/conf/httpd.conf</CODE>). If
+default <CODE>/usr/local/apache/conf/httpd.conf</CODE>). If
this file is somewhere else, you can give the real
location with the -f argument. For example:
1.13 +1 -1 apachen/htdocs/manual/invoking.html
Index: invoking.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/invoking.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -u -r1.12 -r1.13
/usr/bin/diff: conflicting specifications of output style
--- invoking.html 1997/07/06 17:18:54 1.12
+++ invoking.html 1997/10/25 22:35:08 1.13
@@ -30,7 +30,7 @@
<dd>Set the initial value for the
<A HREF="mod/core.html#serverroot">ServerRoot</A> variable to
<em>serverroot</em>. This can be overridden by the ServerRoot command in the
-configuration file. The default is <code>/usr/local/etc/httpd</code>.
+configuration file. The default is <code>/usr/local/apache</code>.
<dt><code>-f</code> <em>config</em>
<dd>Execute the commands in the file <em>config</em> on startup. If
1.9 +2 -2 apachen/htdocs/manual/stopping.html
Index: stopping.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/stopping.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -u -r1.8 -r1.9
/usr/bin/diff: conflicting specifications of output style
--- stopping.html 1997/06/04 11:07:51 1.8
+++ stopping.html 1997/10/25 22:35:08 1.9
@@ -25,13 +25,13 @@
<p>To send a signal to the parent you should issue a command such as:
<blockquote><pre>
- kill -TERM `cat /usr/local/etc/httpd/logs/httpd.pid`
+ kill -TERM `cat /usr/local/apache/logs/httpd.pid`
</pre></blockquote>
You can read about its progress by issuing:
<blockquote><pre>
- tail -f /usr/local/etc/httpd/logs/error_log
+ tail -f /usr/local/apache/logs/error_log
</pre></blockquote>
Modify those examples to match your
1.14 +6 -6 apachen/htdocs/manual/suexec.html
Index: suexec.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/suexec.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -u -r1.13 -r1.14
/usr/bin/diff: conflicting specifications of output style
--- suexec.html 1997/07/06 17:18:56 1.13
+++ suexec.html 1997/10/25 22:35:09 1.14
@@ -326,14 +326,14 @@
* 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 @@
<EM>From src/httpd.h</EM>
<PRE>
/* The path to the suEXEC wrapper */
- #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
+ #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
</PRE>
</P>
@@ -378,7 +378,7 @@
</P>
<P ALIGN="LEFT">
-<STRONG><CODE>cp suexec /usr/local/etc/httpd/sbin/suexec
[ENTER]</CODE></STRONG>
+<STRONG><CODE>cp suexec /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
</P>
<P ALIGN="LEFT">
@@ -389,8 +389,8 @@
</P>
<P ALIGN="LEFT">
-<STRONG><CODE>chown root /usr/local/etc/httpd/sbin/suexec
[ENTER]</CODE></STRONG><BR>
-<STRONG><CODE>chmod 4711 /usr/local/etc/httpd/sbin/suexec
[ENTER]</CODE></STRONG>
+<STRONG><CODE>chown root /usr/local/apache/sbin/suexec
[ENTER]</CODE></STRONG><BR>
+<STRONG><CODE>chmod 4711 /usr/local/apache/sbin/suexec
[ENTER]</CODE></STRONG>
</P>
<P ALIGN="CENTER">
1.91 +3 -3 apachen/htdocs/manual/misc/FAQ.html
Index: FAQ.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -u -r1.90 -r1.91
/usr/bin/diff: conflicting specifications of output style
--- FAQ.html 1997/10/21 01:10:27 1.90
+++ FAQ.html 1997/10/25 22:35:10 1.91
@@ -15,7 +15,7 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
- $Revision: 1.90 $ ($Date: 1997/10/21 01:10:27 $)
+ $Revision: 1.91 $ ($Date: 1997/10/25 22:35:10 $)
</P>
<P>
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
- <SAMP>/usr/local/etc/httpd/logs/error_log</SAMP>, but see the
+ <SAMP>/usr/local/apache/logs/error_log</SAMP>, but see the
<A
HREF="../mod/core.html#errorlog"
><SAMP>ErrorLog</SAMP></A>
@@ -1731,7 +1731,7 @@
<BR>
AuthType Basic
<BR>
- AuthUserFile /usr/local/etc/httpd/conf/htpasswd.users
+ AuthUserFile /usr/local/apache/conf/htpasswd.users
<BR>
AuthName special directory
<BR>
1.81 +2 -2 apachen/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v
retrieving revision 1.80
retrieving revision 1.81
diff -c -u -r1.80 -r1.81
/usr/bin/diff: conflicting specifications of output style
--- core.html 1997/10/10 09:13:09 1.80
+++ core.html 1997/10/25 22:35:13 1.81
@@ -488,7 +488,7 @@
<!--%plaintext <?INDEX {\tt DocumentRoot} directive> -->
<strong>Syntax:</strong> DocumentRoot <em>directory-filename</em><br>
<strong>Default:</strong> <code>DocumentRoot
-/usr/local/etc/httpd/htdocs</code><br>
+/usr/local/apache/htdocs</code><br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<p>
@@ -1530,7 +1530,7 @@
<h2><A name="serverroot">ServerRoot directive</A></h2>
<!--%plaintext <?INDEX {\tt ServerRoot} directive> -->
<strong>Syntax:</strong> ServerRoot <em>directory-filename</em><br>
-<strong>Default:</strong> <code>ServerRoot /usr/local/etc/httpd</code><br>
+<strong>Default:</strong> <code>ServerRoot /usr/local/apache</code><br>
<strong>Context:</strong> server config<br>
<strong>Status:</strong> core<p>
1.13 +3 -3 apachen/htdocs/manual/mod/mod_alias.html
Index: mod_alias.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_alias.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -u -r1.12 -r1.13
/usr/bin/diff: conflicting specifications of output style
--- mod_alias.html 1997/07/08 04:45:24 1.12
+++ mod_alias.html 1997/10/25 22:35:13 1.13
@@ -59,7 +59,7 @@
<P>
Note that if you include a trailing / on the <em>url-path</em> then the
server will require a trailing / in order to expand the alias. That is,
-if you use <code>Alias /icons/ /usr/local/etc/httpd/icons/</code> then
+if you use <code>Alias /icons/ /usr/local/apache/icons/</code> then
the url <code>/icons</code> will not be aliased.
</p>
<P>
@@ -83,7 +83,7 @@
matches into the given string and use it as a filename. For example,
to activate the <code>/icons</code> directory, one might use:
<pre>
- AliasMatch ^/icons(.*) /usr/local/etc/httpd/icons$1
+ AliasMatch ^/icons(.*) /usr/local/apache/icons$1
</pre>
</p>
@@ -248,7 +248,7 @@
matches into the given string and use it as a filename. For example,
to activate the standard <code>/cgi-bin</code>, one might use:
<pre>
- ScriptAlias ^/cgi-bin(.*) /usr/local/etc/httpd/cgi-bin$1
+ ScriptAlias ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
</pre>
</p>
1.473 +3 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.472
retrieving revision 1.473
diff -c -u -r1.472 -r1.473
/usr/bin/diff: conflicting specifications of output style
--- CHANGES 1997/10/25 19:35:14 1.472
+++ CHANGES 1997/10/25 22:35:15 1.473
@@ -1,5 +1,8 @@
Changes with Apache 1.3b3
+ *) Default pathname has been changed everywhere to /usr/local/apache
+ [Sameer <[EMAIL PROTECTED]>]
+
*) PORT: AIX now uses USE_FCNTL_SERIALIZED_ACCEPT.
[David Bronder <[EMAIL PROTECTED]>] PR#849
1.163 +3 -3 apachen/src/main/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -c -u -r1.162 -r1.163
/usr/bin/diff: conflicting specifications of output style
--- httpd.h 1997/10/22 20:29:47 1.162
+++ httpd.h 1997/10/25 22:35:17 1.163
@@ -74,7 +74,7 @@
/* Set default for Windows file system */
#define HTTPD_ROOT "/apache"
#else
-#define HTTPD_ROOT "/usr/local/etc/httpd"
+#define HTTPD_ROOT "/usr/local/apache"
#endif
#endif /* HTTPD_ROOT */
@@ -84,7 +84,7 @@
/* Set default for OS/2 file system */
#define DOCUMENT_LOCATION "/os2httpd/docs"
#else
-#define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
+#define DOCUMENT_LOCATION "/usr/local/apache/htdocs"
#endif
#endif /* DOCUMENT_LOCATION */
@@ -225,7 +225,7 @@
/* The path to the suExec wrapper, can be overridden in Configuration */
#ifndef SUEXEC_BIN
-#define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
+#define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
#endif
/* The default string lengths */
1.62 +2 -2 apachen/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -c -u -r1.61 -r1.62
/usr/bin/diff: conflicting specifications of output style
--- mod_cgi.c 1997/10/22 20:30:18 1.61
+++ mod_cgi.c 1997/10/25 22:35:18 1.62
@@ -178,7 +178,7 @@
/* "%% [Wed Jun 19 10:53:21 1996] GET /cgi-bin/printenv HTTP/1.0" */
fprintf(f, "%%%% [%s] %s %s%s%s %s\n", get_time(), r->method, r->uri,
r->args ? "?" : "", r->args ? r->args : "", r->protocol);
- /* "%% 500 /usr/local/etc/httpd/cgi-bin */
+ /* "%% 500 /usr/local/apache/cgi-bin */
fprintf(f, "%%%% %d %s\n", ret, r->filename);
fprintf(f, "%%error\n%s\n", error);
@@ -212,7 +212,7 @@
/* "%% [Wed Jun 19 10:53:21 1996] GET /cgi-bin/printenv HTTP/1.0" */
fprintf(f, "%%%% [%s] %s %s%s%s %s\n", get_time(), r->method, r->uri,
r->args ? "?" : "", r->args ? r->args : "", r->protocol);
- /* "%% 500 /usr/local/etc/httpd/cgi-bin" */
+ /* "%% 500 /usr/local/apache/cgi-bin" */
fprintf(f, "%%%% %d %s\n", ret, r->filename);
fputs("%request\n", f);
1.3 +2 -2 apachen/src/support/apachectl
Index: apachectl
===================================================================
RCS file: /export/home/cvs/apachen/src/support/apachectl,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -u -r1.2 -r1.3
/usr/bin/diff: conflicting specifications of output style
--- apachectl 1997/10/22 20:30:42 1.2
+++ apachectl 1997/10/25 22:35:19 1.3
@@ -21,10 +21,10 @@
# -------------------- --------------------
#
# the path to your PID file
-PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
+PIDFILE=/usr/local/apache/logs/httpd.pid
#
# the path to your httpd binary
-HTTPD=/usr/local/etc/httpd/src/httpd
+HTTPD=/usr/local/apache/src/httpd
#
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
1.3 +8 -8 apachen/src/support/httpd.8
Index: httpd.8
===================================================================
RCS file: /export/home/cvs/apachen/src/support/httpd.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -u -r1.2 -r1.3
/usr/bin/diff: conflicting specifications of output style
--- httpd.8 1997/10/22 20:30:45 1.2
+++ httpd.8 1997/10/25 22:35:19 1.3
@@ -82,7 +82,7 @@
.BI \-d " serverroot"
Set the initial value for the ServerRoot directive to \fIserverroot\fP. This
can be overridden by the ServerRoot command in the configuration file. The
-default is \fB/usr/local/etc/httpd\fP.
+default is \fB/usr/local/apache\fP.
.TP
.BI \-f " config"
Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP
@@ -108,19 +108,19 @@
Print a list of the httpd options, and then exit.
.SH FILES
.PD 0
-.B /usr/local/etc/httpd/conf/httpd.conf
+.B /usr/local/apache/conf/httpd.conf
.br
-.B /usr/local/etc/httpd/conf/srm.conf
+.B /usr/local/apache/conf/srm.conf
.br
-.B /usr/local/etc/httpd/conf/access.conf
+.B /usr/local/apache/conf/access.conf
.br
-.B /usr/local/etc/httpd/conf/mime.types
+.B /usr/local/apache/conf/mime.types
.br
-.B /usr/local/etc/httpd/logs/error_log
+.B /usr/local/apache/logs/error_log
.br
-.B /usr/local/etc/httpd/logs/access_log
+.B /usr/local/apache/logs/access_log
.br
-.B /usr/local/etc/httpd/logs/httpd.pid
+.B /usr/local/apache/logs/httpd.pid
.PD
.SH SEE ALSO
.BR inetd (8).
1.12 +2 -2 apachen/src/support/suexec.h
Index: suexec.h
===================================================================
RCS file: /export/home/cvs/apachen/src/support/suexec.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -u -r1.11 -r1.12
/usr/bin/diff: conflicting specifications of output style
--- suexec.h 1997/10/22 20:30:47 1.11
+++ suexec.h 1997/10/25 22:35:20 1.12
@@ -115,7 +115,7 @@
* debugging purposes.
*/
#ifndef LOG_EXEC
-#define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */
+#define LOG_EXEC "/usr/local/apache/logs/cgi.log" /* Need me? */
#endif
/*
@@ -124,7 +124,7 @@
* that can be used for suEXEC behavior.
*/
#ifndef DOC_ROOT
-#define DOC_ROOT "/usr/local/etc/httpd/htdocs"
+#define DOC_ROOT "/usr/local/apache/htdocs"
#endif
/*
