svn commit: r606135 - /httpd/httpd/trunk/docs/conf/httpd.conf.in

[wr...@apache.org]

Author: wrowe
Date: Fri Dec 21 00:40:11 2007
New Revision: 606135

URL: http://svn.apache.org/viewvc?rev=606135&view=rev
Log:
Start preparing to use the general-case httpd.conf.in,
on Win32.

Note the quoted log *filenames*, which lets us figure
out the difference between fixing "access_log" to be
a windows friendly "access.log", and leaving the custom
log format name pretty_log alone.

Also, prefer the user specified port for example ServerName.

Modified:
    httpd/httpd/trunk/docs/conf/httpd.conf.in

Modified: httpd/httpd/trunk/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/httpd.conf.in?rev=606135&r1=606134&r2=606135&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/httpd.conf.in Fri Dec 21 00:40:11 2007
@@ -13,9 +13,9 @@
 # Configuration and logfile names: If the filenames you specify for many
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo.log"
+# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo_log"
 # with ServerRoot set to "@@ServerRoot@@" will be interpreted by the
-# server as "@@ServerRoot@@/@rel_logfiledir@/foo.log".
+# server as "@@ServerRoot@@/@rel_logfiledir@/foo_log".
 
 #
 # ServerRoot: The top of the directory tree under which the server's
@@ -54,6 +54,7 @@
 @@LoadModule@@
 
 <IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -64,6 +65,8 @@
 #
 User daemon
 Group daemon
+
+</IfModule>
 </IfModule>
 
 # 'Main' server configuration
@@ -92,7 +95,7 @@
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-#ServerName www.example.com:80
+#ServerName www.example.com:@@Port@@
 
 #
 # DocumentRoot: The directory out of which you will serve your
@@ -177,7 +180,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog @rel_logfiledir@/error_log
+ErrorLog "@rel_logfiledir@/error_log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -206,13 +209,13 @@
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog @rel_logfiledir@/access_log common
+    CustomLog "@rel_logfiledir@/access_log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog @rel_logfiledir@/access_log combined
+    #CustomLog "@rel_logfiledir@/access_log" combined
 </IfModule>
 
 <IfModule alias_module>

Re: svn commit: r606135 - /httpd/httpd/trunk/docs/conf/httpd.conf.in

["William A. Rowe, Jr." <wr...@rowe-clan.net>]

Guenter Knauf wrote:
> Hi Bill,
>> Also, prefer the user specified port for example ServerName.
> what do you think about making the SSL port also _properly_ configurable?
> I suggested already some months ago a patch for that without feedback....
> I know that you do that already with the Win32 conf, and I do it for NetWare;
> so mainly the Unix part is still missing....
> 
> here's my old patch which is now partly (for NetWare) already obsolete:
> 
> http://people.apache.org/~fuankg/diffs/sslport.diff

I'll use your naming convention and prepare for the eventual addition.

I completely agree.

Bill

Re: svn commit: r606135 - /httpd/httpd/trunk/docs/conf/httpd.conf.in

[Guenter Knauf <fu...@apache.org>]

Hi Bill,
> Also, prefer the user specified port for example ServerName.
what do you think about making the SSL port also _properly_ configurable?
I suggested already some months ago a patch for that without feedback....
I know that you do that already with the Win32 conf, and I do it for NetWare;
so mainly the Unix part is still missing....

here's my old patch which is now partly (for NetWare) already obsolete:

http://people.apache.org/~fuankg/diffs/sslport.diff

Guen.