SOURCES: apache-httpd.conf - specify dummy ServerName otherwise ap...

[glen]

Author: glen                         Date: Sun Dec 18 19:44:00 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- specify dummy ServerName otherwise apache fails to start
- conf.d (yee)
- typo fix

---- Files affected:
SOURCES:
   apache-httpd.conf (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SOURCES/apache-httpd.conf
diff -u SOURCES/apache-httpd.conf:1.43 SOURCES/apache-httpd.conf:1.44
--- SOURCES/apache-httpd.conf:1.43	Wed Dec 14 23:01:35 2005
+++ SOURCES/apache-httpd.conf	Sun Dec 18 20:43:55 2005
@@ -22,7 +22,7 @@
 # ports, instead of the default. See also the <VirtualHost>
 # directive.
 #
-# Change this to Listen on specific IP addresses as shown below t
+# Change this to Listen on specific IP addresses as shown below to
 # prevent Apache from glomming onto all bound IP addresses.
 #Listen 192.168.1.1:80
 Listen 80
@@ -39,7 +39,7 @@
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-#ServerName www.example.com:80
+ServerName localhost
 
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
@@ -64,8 +64,7 @@
 HostnameLookups Off
 
 # Include other modules and packages config.
-# TODO: use conf.d here oneday
-Include httpd.conf/*.conf
+Include conf.d/*.conf
 
 # Include webapps config
 Include webapps.d/*.conf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-httpd.conf?r1=1.43&r2=1.44&f=u