From bd8a9189c52ebe05d4b273aa522673c035a51d0c Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 12 Sep 2014 10:26:56 -0700
Subject: [PATCH] Add more @ signs to meetbot vhost

Because puppet likes @ signs now.

Change-Id: I1df8740ac27f8e5e4ba6c84e88f72ba8ef1edc69
---
 modules/meetbot/templates/vhost.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/meetbot/templates/vhost.erb b/modules/meetbot/templates/vhost.erb
index 3aa3e18a2b..72917d4886 100644
--- a/modules/meetbot/templates/vhost.erb
+++ b/modules/meetbot/templates/vhost.erb
@@ -2,30 +2,30 @@
 # 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 %>
+  DocumentRoot <%= @docroot %>
   <FilesMatch \.log$>
     ForceType text/plain
     AddDefaultCharset UTF-8
   </FilesMatch>
-  <Directory <%= docroot %>>
-    Options <%= options %>
+  <Directory <%= @docroot %>>
+    Options <%= @options %>
     AllowOverride None
     Order allow,deny
     allow from all
   </Directory>
 
-<%= vhost_extra %>
+<%= @vhost_extra %>
 
-  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>