opendev/puppet-httpd
Code Issues Proposed changes

Merge pull request #11 from mhuffnagle/master

Browse Source 
apache_name not being set properly in templates
This commit is contained in:
James Turnbull 2012-04-20 08:26:27 -07:00
commit 7f70d12fa0
2 changed files with 4 additions and 4 deletions

4
templates/vhost-default.conf.erb

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

4
templates/vhost-proxy.conf.erb

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