Fix variables access warning in logs.vhost template

Use @varname to supress warnings

Change-Id: Iffd343c3f227f3797b1c42e2fb36ac0518bcc529
This commit is contained in:
Fabien Boucher
2015-07-13 10:19:59 +00:00
parent 486bed19fb
commit de50cfa7bd

View File

@@ -3,15 +3,15 @@
# Managed by Puppet # Managed by Puppet
# ************************************ # ************************************
NameVirtualHost <%= vhost_name %>:<%= port %> NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= vhost_name %>:<%= port %>> <VirtualHost <%= @vhost_name %>:<%= @port %>>
ServerName <%= srvname %> ServerName <%= @srvname %>
<% if serveraliases.is_a? Array -%> <% if @serveraliases.is_a? Array -%>
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif serveraliases != '' -%> <% elsif @serveraliases != '' -%>
<%= " ServerAlias #{serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= docroot %> DocumentRoot <%= @docroot %>
# use Apache to compress the results afterwards, to save on the wire # use Apache to compress the results afterwards, to save on the wire
# it's approx 18x savings of wire traffic to compress. We need to # it's approx 18x savings of wire traffic to compress. We need to
@@ -23,8 +23,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
AddEncoding x-gzip gz AddEncoding x-gzip gz
</FilesMatch> </FilesMatch>
<Directory <%= docroot %>> <Directory <%= @docroot %>>
Options <%= options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
@@ -35,30 +35,30 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
Satisfy Any Satisfy Any
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
# old patterns, can be removed in July 2014 # old patterns, can be removed in July 2014
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
@@ -84,8 +84,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
ErrorLog /var/log/apache2/<%= name %>_error.log ErrorLog /var/log/apache2/<%= @name %>_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined CustomLog /var/log/apache2/<%= @name %>_access.log combined
ServerSignature Off ServerSignature Off
</VirtualHost> </VirtualHost>