opendev
/
puppet-openstackid
Code Issues Proposed changes

Merge "Fix vhost configuration sections"

This commit is contained in:
Jenkins 2015-01-24 21:26:37 +00:00 committed by Gerrit Code Review
parent 65255adaf0 8ed5baedad
commit 3be00405e4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/vhost.erb
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") %> ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %>
ErrorLog ${APACHE_LOG_DIR}/openstackid-error.log ErrorLog ${APACHE_LOG_DIR}/openstackid-error.log
@ -10,7 +11,7 @@
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost <%= scope.lookupvar("openstackid::vhost_name") %>:443> <VirtualHost *:443>
ServerName <%= scope.lookupvar("openstackid::vhost_name") %> ServerName <%= scope.lookupvar("openstackid::vhost_name") %>
ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %> ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %>