summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2015-07-09 16:58:59 -0400
committerPaul Belanger <pabelanger@redhat.com>2015-07-10 09:54:55 -0400
commit6559655964f1b52e1868794808a52ffce26182dd (patch)
treeb13684be7fc6452652ce4496ebb940eada45fb4a
parent76cfa283383a0cc9aa442b365382f8943076f27e (diff)
Fix variable access warnings
Change-Id: I9bb68f50be21885072e7e999063f723b2059a2e9 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Tue, 14 Jul 2015 18:16:22 +0000 Reviewed-on: https://review.openstack.org/200263 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--templates/test.vhost.erb4
-rw-r--r--templates/vhost-default.conf.erb24
-rw-r--r--templates/vhost-proxy.conf.erb28
-rw-r--r--templates/vhost-redirect.conf.erb16
4 files changed, 36 insertions, 36 deletions
diff --git a/templates/test.vhost.erb b/templates/test.vhost.erb
index ff3152d..3fc166b 100644
--- a/templates/test.vhost.erb
+++ b/templates/test.vhost.erb
@@ -4,8 +4,8 @@
4NameVirtualHost *:80 4NameVirtualHost *:80
5<VirtualHost *:80> 5<VirtualHost *:80>
6 ServerName testvhost 6 ServerName testvhost
7 DocumentRoot <%= docroot %> 7 DocumentRoot <%= @docroot %>
8 <Directory <%= docroot %>> 8 <Directory <%= @docroot %>>
9 Options Indexes FollowSymLinks MultiViews 9 Options Indexes FollowSymLinks MultiViews
10 AllowOverride None 10 AllowOverride None
11 Order allow,deny 11 Order allow,deny
diff --git a/templates/vhost-default.conf.erb b/templates/vhost-default.conf.erb
index dce19f2..2cb96d5 100644
--- a/templates/vhost-default.conf.erb
+++ b/templates/vhost-default.conf.erb
@@ -3,24 +3,24 @@
3# Managed by Puppet 3# Managed by Puppet
4# ************************************ 4# ************************************
5 5
6NameVirtualHost <%= vhost_name %>:<%= port %> 6NameVirtualHost <%= @vhost_name %>:<%= @port %>
7<VirtualHost <%= vhost_name %>:<%= port %>> 7<VirtualHost <%= @vhost_name %>:<%= @port %>>
8 ServerName <%= srvname %> 8 ServerName <%= @srvname %>
9<% if serveraliases.is_a? Array -%> 9<% if @serveraliases.is_a? Array -%>
10<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> 10<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
11<% elsif serveraliases != '' -%> 11<% elsif @serveraliases != '' -%>
12<%= " ServerAlias #{serveraliases}" -%> 12<%= " ServerAlias #{@serveraliases}" -%>
13<% end -%> 13<% end -%>
14 DocumentRoot <%= docroot %> 14 DocumentRoot <%= @docroot %>
15 <Directory <%= docroot %>> 15 <Directory <%= @docroot %>>
16 Options <%= options %> 16 Options <%= @options %>
17 AllowOverride None 17 AllowOverride None
18 Order allow,deny 18 Order allow,deny
19 allow from all 19 allow from all
20 </Directory> 20 </Directory>
21 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_error.log 21 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
22 LogLevel warn 22 LogLevel warn
23 CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_access.log combined 23 CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
24 ServerSignature Off 24 ServerSignature Off
25</VirtualHost> 25</VirtualHost>
26 26
diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb
index 4794af8..8635dd5 100644
--- a/templates/vhost-proxy.conf.erb
+++ b/templates/vhost-proxy.conf.erb
@@ -1,28 +1,28 @@
1NameVirtualHost <%= vhost_name %>:<%= port %> 1NameVirtualHost <%= @vhost_name %>:<%= @port %>
2<VirtualHost <%= vhost_name %>:<%= port %>> 2<VirtualHost <%= @vhost_name %>:<%= @port %>>
3 <% if ssl == true %> 3 <% if @ssl == true %>
4 SSLEngine on 4 SSLEngine on
5 SSLCertificateFile <%= ssl_path %>/certs/pl.cert 5 SSLCertificateFile <%= @ssl_path %>/certs/pl.cert
6 SSLCertificateKeyFile <%= ssl_path %>/private/pl.key 6 SSLCertificateKeyFile <%= @ssl_path %>/private/pl.key
7 <% end %> 7 <% end %>
8 ServerName <%= srvname %> 8 ServerName <%= @srvname %>
9<% if serveraliases.is_a? Array %> 9<% if @serveraliases.is_a? Array %>
10<% serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %> 10<% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
11<% elsif serveraliases != '' %> 11<% elsif @serveraliases != '' %>
12<%= " ServerAlias #{serveraliases}" %> 12<%= " ServerAlias #{@serveraliases}" %>
13<% end %> 13<% end %>
14 ProxyRequests Off 14 ProxyRequests Off
15 <Proxy *> 15 <Proxy *>
16 Order deny,allow 16 Order deny,allow
17 Allow from all 17 Allow from all
18 </Proxy> 18 </Proxy>
19 ProxyPass / <%= dest %>/ 19 ProxyPass / <%= @dest %>/
20 ProxyPassReverse / <%= dest %>/ 20 ProxyPassReverse / <%= @dest %>/
21 ProxyPreserveHost On 21 ProxyPreserveHost On
22 22
23 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_error.log 23 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
24 LogLevel warn 24 LogLevel warn
25 CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_access.log combined 25 CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
26 26
27</VirtualHost> 27</VirtualHost>
28 28
diff --git a/templates/vhost-redirect.conf.erb b/templates/vhost-redirect.conf.erb
index 240f924..1cd0362 100644
--- a/templates/vhost-redirect.conf.erb
+++ b/templates/vhost-redirect.conf.erb
@@ -1,11 +1,11 @@
1NameVirtualHost <%= vhost_name %>:<%= port %> 1NameVirtualHost <%= @vhost_name %>:<%= @port %>
2<VirtualHost <%= vhost_name %>:<%= port %>> 2<VirtualHost <%= @vhost_name %>:<%= @port %>>
3 ServerName <%= srvname %> 3 ServerName <%= @srvname %>
4<% if serveraliases.is_a? Array %> 4<% if @serveraliases.is_a? Array %>
5<% serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %> 5<% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
6<% elsif serveraliases != '' %> 6<% elsif @serveraliases != '' %>
7<%= " ServerAlias #{serveraliases}" %> 7<%= " ServerAlias #{@serveraliases}" %>
8<% end %> 8<% end %>
9 Redirect / <%= dest %>/ 9 Redirect / <%= @dest %>/
10</VirtualHost> 10</VirtualHost>
11 11