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
This commit is contained in:
Dmitry Teselkin 2014-10-31 09:25:09 +03:00
parent a266ab3e7a
commit 8ed5baedad
1 changed files with 3 additions and 2 deletions

View File

@ -1,4 +1,5 @@
<VirtualHost <%= scope.lookupvar("openstackid::vhost_name") %>:80>
<VirtualHost *:80>
ServerName <%= scope.lookupvar("openstackid::vhost_name") %>
ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %>
ErrorLog ${APACHE_LOG_DIR}/openstackid-error.log
@ -10,7 +11,7 @@
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost <%= scope.lookupvar("openstackid::vhost_name") %>:443>
<VirtualHost *:443>
ServerName <%= scope.lookupvar("openstackid::vhost_name") %>
ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %>