From 60f83bae8d206e549fab1d6e51c4faf3d964243f Mon Sep 17 00:00:00 2001 From: Marc Huffnagle Date: Fri, 17 Feb 2012 14:25:52 -0500 Subject: [PATCH] Explicitly lookup scope of apache_name in templates. --- templates/vhost-default.conf.erb | 4 ++-- templates/vhost-proxy.conf.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/vhost-default.conf.erb b/templates/vhost-default.conf.erb index 5352029..3178f1f 100644 --- a/templates/vhost-default.conf.erb +++ b/templates/vhost-default.conf.erb @@ -18,9 +18,9 @@ NameVirtualHost <%= vhost_name %>:<%= port %> Order allow,deny allow from all - 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 diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb index a7a14c0..7bee3fb 100644 --- a/templates/vhost-proxy.conf.erb +++ b/templates/vhost-proxy.conf.erb @@ -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