From: Ben Shum <bshum@biblio.org>
Date: Mon, 10 Nov 2014 17:20:31 +0000 (-0500)
Subject: LP#1391248: Fix NameVirtualHost warnings in websockets apache2.conf
X-Git-Tag: osrf_rel_2_4_1~9^2~10
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=db4e107a1bad0cb5204c4946b805d11252446d3f;p=OpenSRF.git

LP#1391248: Fix NameVirtualHost warnings in websockets apache2.conf

For the websockets configuration, the sample apache2.conf for Apache 2.4 (i.e.
Ubuntu 14.04, etc.) contains NameVirtualHost entries that are no longer
needed.

When starting apache2-websockets, you may see warnings like:

AH00548: NameVirtualHost has no effect and will be removed in the next
release /etc/apache2-websockets/apache2.conf:53

Remove the NameVirtualHost entries and these warnings go away.

Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/examples/apache_24/websockets/apache2.conf b/examples/apache_24/websockets/apache2.conf
index 9076b5c..64e6a4c 100644
--- a/examples/apache_24/websockets/apache2.conf
+++ b/examples/apache_24/websockets/apache2.conf
@@ -50,7 +50,6 @@ LogFormat "%{User-agent}i" agent
 
 # WebSockets via SSL
 Listen 7682
-NameVirtualHost *:7682
 <VirtualHost *:7682>
     DocumentRoot /var/www
     ServerName localhost:7682
@@ -66,7 +65,6 @@ NameVirtualHost *:7682
 
 # WebSockets via non-SSL
 Listen 7680
-NameVirtualHost *:7680
 <VirtualHost *:7680>
     ServerName localhost:7680
     ServerAlias 127.0.0.1:7680