opendev/puppet-httpd
Code Issues Proposed changes

Fix variable access warnings

Browse Source 
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
<VirtualHost *:80>
ServerName testvhost
DocumentRoot <%= docroot %>
<Directory <%= docroot %>>
DocumentRoot <%= @docroot %>
<Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Order allow,deny

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

@ -3,24 +3,24 @@
# 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 <%= docroot %>>
Options <%= options %>
DocumentRoot <%= @docroot %>
<Directory <%= @docroot %>>
Options <%= @options %>
AllowOverride None
Order allow,deny
allow from all
</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
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
</VirtualHost>

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

@ -1,28 +1,28 @@
NameVirtualHost <%= vhost_name %>:<%= port %>
<VirtualHost <%= vhost_name %>:<%= port %>>
<% if ssl == true %>
NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= @vhost_name %>:<%= @port %>>
<% if @ssl == true %>
SSLEngine on
SSLCertificateFile <%= ssl_path %>/certs/pl.cert
SSLCertificateKeyFile <%= ssl_path %>/private/pl.key
SSLCertificateFile <%= @ssl_path %>/certs/pl.cert
SSLCertificateKeyFile <%= @ssl_path %>/private/pl.key
<% end %>
ServerName <%= srvname %>
<% if serveraliases.is_a? Array %>
<% serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
<% elsif serveraliases != '' %>
<%= " ServerAlias #{serveraliases}" %>
ServerName <%= @srvname %>
<% if @serveraliases.is_a? Array %>
<% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
<% elsif @serveraliases != '' %>
<%= " ServerAlias #{@serveraliases}" %>
<% end %>
ProxyRequests Off
<Proxy *>
Order deny,allow
Allow from all
</Proxy>
ProxyPass / <%= dest %>/
ProxyPassReverse / <%= dest %>/
ProxyPass / <%= @dest %>/
ProxyPassReverse / <%= @dest %>/
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
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>

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

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