opendev
/
puppet-httpd
Code Issues Proposed changes

Explicitly lookup scope of apache_name in templates.

This commit is contained in:
Marc Huffnagle 2012-02-17 14:25:52 -05:00
parent c3b7dccd5d
commit 60f83bae8d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/vhost-default.conf.erb
View File

@ -18,9 +18,9 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
Order allow,deny
allow from all
</Directory>
ErrorLog /var/log/<%= apache_name %>/<%= name %>_error.log
ErrorLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/<%= name %>_error.log
LogLevel warn
CustomLog /var/log/<%= apache_name %>/<%= name %>_access.log combined
CustomLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/<%= name %>_access.log combined
ServerSignature Off
</VirtualHost>

4
templates/vhost-proxy.conf.erb
View File

@ -20,9 +20,9 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
ProxyPassReverse / <%= dest %>/
ProxyPreserveHost On
ErrorLog /var/log/<%= apache_name %>/<%= name %>_error.log
ErrorLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/<%= name %>_error.log
LogLevel warn
CustomLog /var/log/<%= apache_name %>/<%= name %>_access.log combined
CustomLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/<%= name %>_access.log combined
</VirtualHost>