From 47a100573186c2f6e31ac489907b4810680c4920 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Mon, 9 Jul 2018 13:49:00 +0200 Subject: [PATCH] Fix template variables 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 --- templates/logs-dev.vhost.erb | 4 ++-- templates/logs.vhost.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/logs-dev.vhost.erb b/templates/logs-dev.vhost.erb index 6b247b4..9fde2bb 100644 --- a/templates/logs-dev.vhost.erb +++ b/templates/logs-dev.vhost.erb @@ -8,12 +8,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> ServerName <%= @srvname %> <% if @serveraliases.is_a? Array -%> <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> -<% elsif @serveraliases != '' -%> +<% elsif ! ['', nil, :undef].include?(@serveraliases) -%> <%= " ServerAlias #{@serveraliases}" %> <% end -%> 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 WSGIApplicationGroup %{GLOBAL} diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb index d6e4d54..afd3ae2 100644 --- a/templates/logs.vhost.erb +++ b/templates/logs.vhost.erb @@ -8,12 +8,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> ServerName <%= @srvname %> <% if @serveraliases.is_a? Array -%> <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> -<% elsif @serveraliases != '' -%> +<% elsif ! ['', nil, :undef].include?(@serveraliases) -%> <%= " ServerAlias #{@serveraliases}" %> <% end -%> 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 WSGIApplicationGroup %{GLOBAL}