LP#1341013: Remove NameVirtualHost from eg.conf.in for Apache 2.4.
authorJason Stephenson <jstephenson@mvlc.org>
Fri, 11 Jul 2014 14:57:59 +0000 (10:57 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Tue, 15 Jul 2014 14:49:29 +0000 (10:49 -0400)
NameVirtualHost does nothing in Apache 2.4 and will be removed in
the next release.  We might as well get rid of it now and silence
a warning when starting Apache.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Open-ILS/examples/apache_24/eg.conf.in

index b9c373c..b33581d 100644 (file)
@@ -100,7 +100,6 @@ ExpiresByType text/css "access plus 50 minutes"
 # Set up our SSL virtual host
 # ----------------------------------------------------------------------------------
 #Listen 443
-NameVirtualHost *:443
 <VirtualHost *:443>
        DocumentRoot "@localstatedir@/web"
        ServerName localhost:443
@@ -135,8 +134,6 @@ NameVirtualHost *:443
 # errors, per http://wiki.apache.org/httpd/InternalDummyConnection
 # ----------------------------------------------------------------------------------
 
-# Commented to avoid warnings from duplicate "NameVirtualHost: *80" directives
-#NameVirtualHost *:80
 <VirtualHost *:80>
        ServerName localhost:80
        ServerAlias 127.0.0.1:80