opendev/puppet-openstackci
Code Issues Proposed changes

Fix template variables

Browse Source 
Fix the scope for the template variables for the httpd vhost, and fix
the ServerAlias value when serveraliases is undefined.

Depends-On: https://review.openstack.org/578559

Change-Id: Ia0f9b704d95facd4668d972a66f94f741a99bca2
This commit is contained in:
Colleen Murphy
2018-07-09 13:49:00 +02:00
committed by Colleen Murphy
parent f3f7b47cb4
commit 47a1005731
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/logs-dev.vhost.erb
View File

@@ -8,12 +8,12 @@ NameVirtualHost <%= @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 ! ['', nil, :undef].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= @docroot %> DocumentRoot <%= @docroot %>
WSGIDaemonProcess logs-dev user=www-data group=www-data processes=<%= @wsgi_processes %> threads=<%= @wsgi_threads %> WSGIDaemonProcess logs-dev user=www-data group=www-data processes=<%= scope.lookupvar('::openstackci::logserver::wsgi_processes') %> threads=<%= scope.lookupvar('::openstackci::logserver::wsgi_threads') %>
WSGIProcessGroup logs-dev WSGIProcessGroup logs-dev
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}

4
templates/logs.vhost.erb
View File

@@ -8,12 +8,12 @@ NameVirtualHost <%= @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 ! ['', nil, :undef].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= @docroot %> DocumentRoot <%= @docroot %>
WSGIDaemonProcess logs user=www-data group=www-data processes=<%= @wsgi_processes %> threads=<%= @wsgi_threads %> WSGIDaemonProcess logs user=www-data group=www-data processes=<%= scope.lookupvar('::openstackci::logserver::wsgi_processes') %> threads=<%= scope.lookupvar('::openstackci::logserver::wsgi_threads') %>
WSGIProcessGroup logs WSGIProcessGroup logs
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}