httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sameer <sam...@c2.net>
Subject [PATCH] making all the pathnames the same
Date Fri, 24 Oct 1997 19:18:57 GMT
	So the pathnames were not fixed. Here's a patch to make all
the pathnames /usr/local/apache. votes?

Index: README.NT
===================================================================
RCS file: /export/home/cvs/apachen/README.NT,v
retrieving revision 1.6
diff -c -r1.6 README.NT
*** README.NT	1997/10/22 13:30:02	1.6
--- README.NT	1997/10/23 01:11:10
***************
*** 55,61 ****
  
  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):
  
  # Start up 3 servers (in case one dies, another can take its place, while
  # a new one is spawned
--- 55,61 ----
  
  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/apache/conf):
  
  # Start up 3 servers (in case one dies, another can take its place, while
  # a new one is spawned
Index: conf/httpd.conf-dist-win
===================================================================
RCS file: /export/home/cvs/apachen/conf/httpd.conf-dist-win,v
retrieving revision 1.4
diff -c -r1.4 httpd.conf-dist-win
*** httpd.conf-dist-win	1997/07/22 22:33:11	1.4
--- httpd.conf-dist-win	1997/10/23 01:11:10
***************
*** 135,141 ****
  
  # To enable the cache as well, edit and uncomment the following lines:
  
! #CacheRoot /usr/local/etc/httpd/proxy
  #CacheSize 5
  #CacheGcInterval 4
  #CacheMaxExpire 24
--- 135,141 ----
  
  # To enable the cache as well, edit and uncomment the following lines:
  
! #CacheRoot /usr/local/apache/proxy
  #CacheSize 5
  #CacheGcInterval 4
  #CacheMaxExpire 24
Index: htdocs/manual/install.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/install.html,v
retrieving revision 1.14
diff -c -r1.14 install.html
*** install.html	1997/08/24 12:55:09	1.14
--- install.html	1997/10/23 01:11:11
***************
*** 164,170 ****
  
  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
  this file is somewhere else, you can give the real
  location with the -f argument. For example:
  
--- 164,170 ----
  
  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/apache/conf/httpd.conf</CODE>). If
  this file is somewhere else, you can give the real
  location with the -f argument. For example:
  
Index: htdocs/manual/invoking.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/invoking.html,v
retrieving revision 1.12
diff -c -r1.12 invoking.html
*** invoking.html	1997/07/06 17:18:54	1.12
--- invoking.html	1997/10/23 01:11:11
***************
*** 30,36 ****
  <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>.
  
  <dt><code>-f</code> <em>config</em>
  <dd>Execute the commands in the file <em>config</em> on startup. If
--- 30,36 ----
  <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/apache</code>.
  
  <dt><code>-f</code> <em>config</em>
  <dd>Execute the commands in the file <em>config</em> on startup. If
Index: htdocs/manual/stopping.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/stopping.html,v
retrieving revision 1.8
diff -c -r1.8 stopping.html
*** stopping.html	1997/06/04 11:07:51	1.8
--- stopping.html	1997/10/23 01:11:11
***************
*** 25,37 ****
  
  <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`
  </pre></blockquote>
  
  You can read about its progress by issuing:
  
  <blockquote><pre>
!     tail -f /usr/local/etc/httpd/logs/error_log
  </pre></blockquote>
  
  Modify those examples to match your
--- 25,37 ----
  
  <p>To send a signal to the parent you should issue a command such as:
  <blockquote><pre>
!     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/apache/logs/error_log
  </pre></blockquote>
  
  Modify those examples to match your
Index: htdocs/manual/suexec.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/suexec.html,v
retrieving revision 1.13
diff -c -r1.13 suexec.html
*** suexec.html	1997/07/06 17:18:56	1.13
--- suexec.html	1997/10/23 01:11:11
***************
*** 326,339 ****
        *             transactions and errors logged for auditing and
        *             debugging purposes.
        */
!      #define LOG_EXEC "/usr/local/etc/httpd/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"
  
       /*
        * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
--- 326,339 ----
        *             transactions and errors logged for auditing and
        *             debugging purposes.
        */
!      #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/apache/htdocs"
  
       /*
        * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
***************
*** 360,366 ****
  <EM>From src/httpd.h</EM>
  <PRE>
       /* The path to the suEXEC wrapper */
!      #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
  </PRE>
  </P>
  
--- 360,366 ----
  <EM>From src/httpd.h</EM>
  <PRE>
       /* The path to the suEXEC wrapper */
!      #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
  </PRE>
  </P>
  
***************
*** 378,384 ****
  </P>
  
  <P ALIGN="LEFT">
! <STRONG><CODE>cp suexec /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
  </P>
  
  <P ALIGN="LEFT">
--- 378,384 ----
  </P>
  
  <P ALIGN="LEFT">
! <STRONG><CODE>cp suexec /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
  </P>
  
  <P ALIGN="LEFT">
***************
*** 389,396 ****
  </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>
  </P>
  
  <P ALIGN="CENTER">
--- 389,396 ----
  </P>
  
  <P ALIGN="LEFT">
! <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">
Index: htdocs/manual/misc/FAQ.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v
retrieving revision 1.90
diff -c -r1.90 FAQ.html
*** FAQ.html	1997/10/21 01:10:27	1.90
--- FAQ.html	1997/10/23 01:11:11
***************
*** 457,463 ****
      the server error log.  Sometimes this is enough for you to diagnose
      &amp; 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
      <A
       HREF="../mod/core.html#errorlog"
      ><SAMP>ErrorLog</SAMP></A>
--- 457,463 ----
      the server error log.  Sometimes this is enough for you to diagnose
      &amp; fix the problem yourself (such as file permissions or the like).
      The default location of the error log is
!     <SAMP>/usr/local/apache/logs/error_log</SAMP>, but see the
      <A
       HREF="../mod/core.html#errorlog"
      ><SAMP>ErrorLog</SAMP></A>
***************
*** 1731,1737 ****
      <BR>
      AuthType Basic
      <BR>
!     AuthUserFile /usr/local/etc/httpd/conf/htpasswd.users
      <BR>
      AuthName special directory
      <BR>
--- 1731,1737 ----
      <BR>
      AuthType Basic
      <BR>
!     AuthUserFile /usr/local/apache/conf/htpasswd.users
      <BR>
      AuthName special directory
      <BR>
Index: htdocs/manual/mod/core.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v
retrieving revision 1.80
diff -c -r1.80 core.html
*** core.html	1997/10/10 09:13:09	1.80
--- core.html	1997/10/23 01:11:12
***************
*** 488,494 ****
  <!--%plaintext &lt;?INDEX {\tt DocumentRoot} directive&gt; -->
  <strong>Syntax:</strong> DocumentRoot <em>directory-filename</em><br>
  <strong>Default:</strong> <code>DocumentRoot
! /usr/local/etc/httpd/htdocs</code><br>
  <strong>Context:</strong> server config, virtual host<br>
  <strong>Status:</strong> core<p>
  
--- 488,494 ----
  <!--%plaintext &lt;?INDEX {\tt DocumentRoot} directive&gt; -->
  <strong>Syntax:</strong> DocumentRoot <em>directory-filename</em><br>
  <strong>Default:</strong> <code>DocumentRoot
! /usr/local/apache/htdocs</code><br>
  <strong>Context:</strong> server config, virtual host<br>
  <strong>Status:</strong> core<p>
  
***************
*** 1530,1536 ****
  <h2><A name="serverroot">ServerRoot directive</A></h2>
  <!--%plaintext &lt;?INDEX {\tt ServerRoot} directive&gt; -->
  <strong>Syntax:</strong> ServerRoot <em>directory-filename</em><br>
! <strong>Default:</strong> <code>ServerRoot /usr/local/etc/httpd</code><br>
  <strong>Context:</strong> server config<br>
  <strong>Status:</strong> core<p>
  
--- 1530,1536 ----
  <h2><A name="serverroot">ServerRoot directive</A></h2>
  <!--%plaintext &lt;?INDEX {\tt ServerRoot} directive&gt; -->
  <strong>Syntax:</strong> ServerRoot <em>directory-filename</em><br>
! <strong>Default:</strong> <code>ServerRoot /usr/local/apache</code><br>
  <strong>Context:</strong> server config<br>
  <strong>Status:</strong> core<p>
  
Index: htdocs/manual/mod/mod_alias.html
===================================================================
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_alias.html,v
retrieving revision 1.12
diff -c -r1.12 mod_alias.html
*** mod_alias.html	1997/07/08 04:45:24	1.12
--- mod_alias.html	1997/10/23 01:11:12
***************
*** 59,65 ****
  <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
  the url <code>/icons</code> will not be aliased.
  </p>
  <P>
--- 59,65 ----
  <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/apache/icons/</code> then
  the url <code>/icons</code> will not be aliased.
  </p>
  <P>
***************
*** 83,89 ****
  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
  </pre>
  </p>
  
--- 83,89 ----
  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/apache/icons$1
  </pre>
  </p>
  
***************
*** 248,254 ****
  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
  </pre>
  </p>
  
--- 248,254 ----
  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/apache/cgi-bin$1
  </pre>
  </p>
  
Index: src/main/httpd.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
retrieving revision 1.162
diff -c -r1.162 httpd.h
*** httpd.h	1997/10/22 20:29:47	1.162
--- httpd.h	1997/10/23 01:11:13
***************
*** 74,80 ****
  /* Set default for Windows file system */
  #define HTTPD_ROOT "/apache"
  #else
! #define HTTPD_ROOT "/usr/local/etc/httpd"
  #endif
  #endif /* HTTPD_ROOT */
  
--- 74,80 ----
  /* Set default for Windows file system */
  #define HTTPD_ROOT "/apache"
  #else
! #define HTTPD_ROOT "/usr/local/apache"
  #endif
  #endif /* HTTPD_ROOT */
  
***************
*** 84,90 ****
  /* Set default for OS/2 file system */
  #define DOCUMENT_LOCATION "/os2httpd/docs"
  #else
! #define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
  #endif
  #endif /* DOCUMENT_LOCATION */
  
--- 84,90 ----
  /* Set default for OS/2 file system */
  #define DOCUMENT_LOCATION "/os2httpd/docs"
  #else
! #define DOCUMENT_LOCATION "/usr/local/apache/htdocs"
  #endif
  #endif /* DOCUMENT_LOCATION */
  
***************
*** 225,231 ****
  
  /* The path to the suExec wrapper, can be overridden in Configuration */
  #ifndef SUEXEC_BIN
! #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
  #endif
  
  /* The default string lengths */
--- 225,231 ----
  
  /* The path to the suExec wrapper, can be overridden in Configuration */
  #ifndef SUEXEC_BIN
! #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
  #endif
  
  /* The default string lengths */
Index: src/modules/standard/mod_cgi.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
retrieving revision 1.61
diff -c -r1.61 mod_cgi.c
*** mod_cgi.c	1997/10/22 20:30:18	1.61
--- mod_cgi.c	1997/10/23 01:11:14
***************
*** 178,184 ****
      /* "%% [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 */
      fprintf(f, "%%%% %d %s\n", ret, r->filename);
  
      fprintf(f, "%%error\n%s\n", error);
--- 178,184 ----
      /* "%% [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/apache/cgi-bin */
      fprintf(f, "%%%% %d %s\n", ret, r->filename);
  
      fprintf(f, "%%error\n%s\n", error);
***************
*** 212,218 ****
      /* "%% [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" */
      fprintf(f, "%%%% %d %s\n", ret, r->filename);
  
      fputs("%request\n", f);
--- 212,218 ----
      /* "%% [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/apache/cgi-bin" */
      fprintf(f, "%%%% %d %s\n", ret, r->filename);
  
      fputs("%request\n", f);
Index: src/support/apachectl
===================================================================
RCS file: /export/home/cvs/apachen/src/support/apachectl,v
retrieving revision 1.2
diff -c -r1.2 apachectl
*** apachectl	1997/10/22 20:30:42	1.2
--- apachectl	1997/10/23 01:11:14
***************
*** 21,30 ****
  # --------------------                              --------------------
  # 
  # the path to your PID file
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
  #
  # the path to your httpd binary
! HTTPD=/usr/local/etc/httpd/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
--- 21,30 ----
  # --------------------                              --------------------
  # 
  # the path to your PID file
! PIDFILE=/usr/local/apache/logs/httpd.pid
  #
  # the path to your httpd binary
! 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
Index: src/support/httpd.8
===================================================================
RCS file: /export/home/cvs/apachen/src/support/httpd.8,v
retrieving revision 1.2
diff -c -r1.2 httpd.8
*** httpd.8	1997/10/22 20:30:45	1.2
--- httpd.8	1997/10/23 01:11:14
***************
*** 82,88 ****
  .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.
  .TP
  .BI \-f " config"
  Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP
--- 82,88 ----
  .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/apache\fP.
  .TP
  .BI \-f " config"
  Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP
***************
*** 108,126 ****
  Print a list of the httpd options, and then exit.
  .SH FILES
  .PD 0
! .B /usr/local/etc/httpd/conf/httpd.conf
  .br
! .B /usr/local/etc/httpd/conf/srm.conf
  .br
! .B /usr/local/etc/httpd/conf/access.conf
  .br
! .B /usr/local/etc/httpd/conf/mime.types
  .br
! .B /usr/local/etc/httpd/logs/error_log
  .br
! .B /usr/local/etc/httpd/logs/access_log
  .br
! .B /usr/local/etc/httpd/logs/httpd.pid
  .PD
  .SH SEE ALSO
  .BR inetd (8).
--- 108,126 ----
  Print a list of the httpd options, and then exit.
  .SH FILES
  .PD 0
! .B /usr/local/apache/conf/httpd.conf
  .br
! .B /usr/local/apache/conf/srm.conf
  .br
! .B /usr/local/apache/conf/access.conf
  .br
! .B /usr/local/apache/conf/mime.types
  .br
! .B /usr/local/apache/logs/error_log
  .br
! .B /usr/local/apache/logs/access_log
  .br
! .B /usr/local/apache/logs/httpd.pid
  .PD
  .SH SEE ALSO
  .BR inetd (8).
Index: src/support/suexec.h
===================================================================
RCS file: /export/home/cvs/apachen/src/support/suexec.h,v
retrieving revision 1.11
diff -c -r1.11 suexec.h
*** suexec.h	1997/10/22 20:30:47	1.11
--- suexec.h	1997/10/23 01:11:14
***************
*** 115,121 ****
   *             debugging purposes.
   */
  #ifndef LOG_EXEC
! #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log"	/* Need me? */
  #endif
  
  /*
--- 115,121 ----
   *             debugging purposes.
   */
  #ifndef LOG_EXEC
! #define LOG_EXEC "/usr/local/apache/logs/cgi.log"	/* Need me? */
  #endif
  
  /*
***************
*** 124,130 ****
   *             that can be used for suEXEC behavior.
   */
  #ifndef DOC_ROOT
! #define DOC_ROOT "/usr/local/etc/httpd/htdocs"
  #endif
  
  /*
--- 124,130 ----
   *             that can be used for suEXEC behavior.
   */
  #ifndef DOC_ROOT
! #define DOC_ROOT "/usr/local/apache/htdocs"
  #endif
  
  /*

-- 
Sameer Parekh					Voice:   510-986-8770
President					FAX:     510-986-8777
C2Net
http://www.c2.net/				sameer@c2.net

Mime
View raw message