opendev
/
puppet-httpd
Code Issues Proposed changes

Fix variable access warnings 

Change-Id: I9bb68f50be21885072e7e999063f723b2059a2e9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-09 16:58:59 -04:00
parent 76cfa28338
commit 6559655964
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/test.vhost.erb
View File

@ -4,8 +4,8 @@
NameVirtualHost *:80 NameVirtualHost *:80
<VirtualHost *:80> <VirtualHost *:80>
ServerName testvhost ServerName testvhost
DocumentRoot <%= docroot %> DocumentRoot <%= @docroot %>
<Directory <%= docroot %>> <Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny

24
templates/vhost-default.conf.erb
View File

@ -3,24 +3,24 @@
# 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 %>
<Directory <%= docroot %>> <Directory <%= @docroot %>>
Options <%= options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
</Directory> </Directory>
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_error.log ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_access.log combined CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
ServerSignature Off ServerSignature Off
</VirtualHost> </VirtualHost>

28
templates/vhost-proxy.conf.erb
View File

@ -1,28 +1,28 @@
NameVirtualHost <%= vhost_name %>:<%= port %> NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= vhost_name %>:<%= port %>> <VirtualHost <%= @vhost_name %>:<%= @port %>>
<% if ssl == true %> <% if @ssl == true %>
SSLEngine on SSLEngine on
SSLCertificateFile <%= ssl_path %>/certs/pl.cert SSLCertificateFile <%= @ssl_path %>/certs/pl.cert
SSLCertificateKeyFile <%= ssl_path %>/private/pl.key SSLCertificateKeyFile <%= @ssl_path %>/private/pl.key
<% end %> <% end %>
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 %>
ProxyRequests Off ProxyRequests Off
<Proxy *> <Proxy *>
Order deny,allow Order deny,allow
Allow from all Allow from all
</Proxy> </Proxy>
ProxyPass / <%= dest %>/ ProxyPass / <%= @dest %>/
ProxyPassReverse / <%= dest %>/ ProxyPassReverse / <%= @dest %>/
ProxyPreserveHost On ProxyPreserveHost On
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_error.log ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_access.log combined CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
</VirtualHost> </VirtualHost>

16
templates/vhost-redirect.conf.erb
View File

@ -1,11 +1,11 @@
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 %>
Redirect / <%= dest %>/ Redirect / <%= @dest %>/
</VirtualHost> </VirtualHost>