opendev
/
puppet-hound
Code Issues Proposed changes

Fix vhost in hound Apache configuration 

Calling just vhost_name in the Apache template was populating the
file with a * for the name. Add the full scope so it finds what it
needs.

Change-Id: Ibd78236e31e729261ac96c6964f3c2d5796a9566
This commit is contained in:
Elizabeth K. Joseph 2015-10-29 22:50:47 -07:00
parent 6ce0881b6a
commit 688aed48d3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/hound.vhost.erb
View File

@ -1,12 +1,12 @@
<VirtualHost *:80>
ServerName <%= @vhost_name %>
ServerName <%= scope.lookupvar("hound::vhost_name") %>
ServerAdmin <%= @serveradmin %>
ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("hound::vhost_name") %>-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-access.log combined
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("hound::vhost_name") %>-access.log combined
<IfModule mod_proxy.c>
RewriteEngine on