From: Jason Stephenson Date: Fri, 11 Jul 2014 14:57:59 +0000 (-0400) Subject: LP#1341013: Remove NameVirtualHost from eg.conf.in for Apache 2.4. X-Git-Tag: sprint4-merge-nov22~2039 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0bee17b1ffd741bfcfced9ae7eb2d8d9cf59044f;p=working%2FEvergreen.git LP#1341013: Remove NameVirtualHost from eg.conf.in for Apache 2.4. 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 Signed-off-by: Ben Shum --- diff --git a/Open-ILS/examples/apache_24/eg.conf.in b/Open-ILS/examples/apache_24/eg.conf.in index b9c373cd93..b33581d1c5 100644 --- a/Open-ILS/examples/apache_24/eg.conf.in +++ b/Open-ILS/examples/apache_24/eg.conf.in @@ -100,7 +100,6 @@ ExpiresByType text/css "access plus 50 minutes" # Set up our SSL virtual host # ---------------------------------------------------------------------------------- #Listen 443 -NameVirtualHost *: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 ServerName localhost:80 ServerAlias 127.0.0.1:80