From 18db8dc246b4b22ac30c987308cab4a22c4f074c Mon Sep 17 00:00:00 2001
From: Dmitry Teselkin <dteselkin@mirantis.com>
Date: Fri, 31 Oct 2014 09:25:09 +0300
Subject: [PATCH] Fix vhost configuration sections

According to https://wiki.apache.org/httpd/CommonMisconfigurations
is is wrong to specify server name in opening tag. ServerName
should be used instead.

Indentations also fixed in some files.

Change-Id: Id9d20a672103221efa01be61a174b62706036e57
---
 templates/etherpadlite.vhost.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/etherpadlite.vhost.erb b/templates/etherpadlite.vhost.erb
index b77aa10..e6711bb 100644
--- a/templates/etherpadlite.vhost.erb
+++ b/templates/etherpadlite.vhost.erb
@@ -1,4 +1,5 @@
-<VirtualHost <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>:80>
+<VirtualHost *:80>
+  ServerName <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
   ServerAdmin <%= scope.lookupvar("etherpad_lite::apache::serveradmin") %>
 
   ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>-error.log
@@ -12,7 +13,7 @@
 </VirtualHost>
 
 <IfModule mod_ssl.c>
-<VirtualHost <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>:443>
+<VirtualHost *:443>
   ServerName <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
   ServerAdmin <%= scope.lookupvar("etherpad_lite::apache::serveradmin") %>