opendev/system-config
Code Issues Proposed changes

Merge "Fix template variables"

Browse Source
This commit is contained in:
Zuul 2018-07-21 13:40:44 +00:00 committed by Gerrit Code Review
commit 8a52cb7e26
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/templates/legacy.vhost.erb
View File

@ -7,7 +7,7 @@ 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].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>

2
modules/openstack_project/templates/static-governance.vhost.erb
View File

@ -6,7 +6,7 @@
ServerName <%= @vhost_name %> ServerName <%= @vhost_name %>
<% 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].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
RewriteEngine On RewriteEngine On

2
modules/openstack_project/templates/static-http-and-https.vhost.erb
View File

@ -7,7 +7,7 @@
<% if @serveraliases.is_a? Array -%> <% if @serveraliases.is_a? Array -%>
# Permanently redirect these ServerAlias entries to ServerName # Permanently redirect these ServerAlias entries to ServerName
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif @serveraliases != '' -%> <% elsif ! ['', nil].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
RewriteEngine On RewriteEngine On
RewriteCond %{HTTP_HOST} !<%= @vhost_name %>$ [NC] RewriteCond %{HTTP_HOST} !<%= @vhost_name %>$ [NC]

2
modules/openstack_project/templates/static-https-redirect.vhost.erb
View File

@ -6,7 +6,7 @@
ServerName <%= @vhost_name %> ServerName <%= @vhost_name %>
<% 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].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
RewriteEngine On RewriteEngine On

2
modules/openstack_project/templates/status.vhost.erb
View File

@ -7,7 +7,7 @@ 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].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= @docroot %> DocumentRoot <%= @docroot %>

2
modules/openstack_project/templates/summit.vhost.erb
View File

@ -7,7 +7,7 @@ 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].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>