Merge "Fix template variables"
This commit is contained in:
commit
173d2cf49d
@ -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}
|
||||||
|
|
||||||
|
@ -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}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user