From c2c38641273484ab935bbed4055c8cbba5fb1f93 Mon Sep 17 00:00:00 2001
From: William Van Hevelingen <blkperl@cat.pdx.edu>
Date: Sun, 23 Mar 2014 10:13:56 -0700
Subject: [PATCH] Fix @var deprecation warnings in drupal templates

Change-Id: I603d54bc6fb002f634c2da77465ad6569c08ce0a
---
 modules/drupal/templates/drupal.vhost.erb | 22 +++++++++++-----------
 modules/drupal/templates/site.config.erb  | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/modules/drupal/templates/drupal.vhost.erb b/modules/drupal/templates/drupal.vhost.erb
index 82657e23fc..9f1219321c 100644
--- a/modules/drupal/templates/drupal.vhost.erb
+++ b/modules/drupal/templates/drupal.vhost.erb
@@ -3,16 +3,16 @@
 # Managed by Puppet
 # ************************************
 
-NameVirtualHost <%= vhost_name %>:<%= port %>
-<VirtualHost <%= vhost_name %>:<%= port %>>
-  ServerName <%= srvname %>
-<% if serveraliases.is_a? Array -%>
-<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif serveraliases != '' -%>
-<%= " ServerAlias #{serveraliases}" %>
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+<% if @serveraliases.is_a? Array -%>
+<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
+<% elsif @serveraliases != '' -%>
+<%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
-  DocumentRoot <%= docroot %>
-  <Directory <%= site_docroot %>>
+  DocumentRoot <%= @docroot %>
+  <Directory <%= @site_docroot %>>
     Options FollowSymLinks MultiViews
     AllowOverride None
     Order allow,deny
@@ -132,8 +132,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
       </IfModule>
     </IfModule>
   </Directory>
-  ErrorLog /var/log/apache2/<%= name %>_error.log
+  ErrorLog /var/log/apache2/<%= @name %>_error.log
   LogLevel warn
-  CustomLog /var/log/apache2/<%= name %>_access.log combined
+  CustomLog /var/log/apache2/<%= @name %>_access.log combined
   ServerSignature Off
 </VirtualHost>
diff --git a/modules/drupal/templates/site.config.erb b/modules/drupal/templates/site.config.erb
index 2130e5032d..a67d4cd935 100644
--- a/modules/drupal/templates/site.config.erb
+++ b/modules/drupal/templates/site.config.erb
@@ -1,13 +1,13 @@
-# Site deployment config file: <%= site_name %>
+# Site deployment config file: <%= @site_name %>
 #
 
-site_tarball=<%= site_staging_root %>/<%= site_staging_tarball %>
-db_url=mysql://<%= site_mysql_user %>:<%= site_mysql_password %>@<%= site_mysql_host %>/<%= site_mysql_database %>
-site_admin_password=<%= site_admin_password %>
-site_name=<%= site_name %>
-profile_name=<%= site_profile %>
-dest_dir=<%= site_docroot %>
-flag_file=<%= site_deploy_flagfile %>
+site_tarball=<%= @site_staging_root %>/<%= @site_staging_tarball %>
+db_url=mysql://<%= @site_mysql_user %>:<%= @site_mysql_password %>@<%= @site_mysql_host %>/<%= @site_mysql_database %>
+site_admin_password=<%= @site_admin_password %>
+site_name=<%= @site_name %>
+profile_name=<%= @site_profile %>
+dest_dir=<%= @site_docroot %>
+flag_file=<%= @site_deploy_flagfile %>
 is_clean=true
-base_url=<%= site_base_url %>
-file_owner=<%= site_file_owner %>
+base_url=<%= @site_base_url %>
+file_owner=<%= @site_file_owner %>