b54344129d
We almost never define $serveraliases which means that it's always going to be empty. Puppet 4 is more strict about types and converting undef to nil so this change makes sure that an undefined variable doesn't accidentally get evaluated as existing and cause an invalid apache config. In the places where we're already just comparing @serveraliases to nil, just leave them alone. Nil should be the expected value for undefined variables going forward in puppet 4, so as long as it's working in puppet 3 let's keep it. Change-Id: I68ea8e1fde5d422f821453ff618d827e3cbe1c43
22 lines
739 B
Plaintext
22 lines
739 B
Plaintext
# ************************************
|
|
# 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 ! ['', nil].include?(@serveraliases) -%>
|
|
<%= " ServerAlias #{@serveraliases}" %>
|
|
<% end -%>
|
|
|
|
RewriteEngine On
|
|
RewriteRule ^/(.*) https://docs.openstack.org/developer/<%= @name.split('.')[0] %>/$1 [last,redirect=permanent]
|
|
|
|
ErrorLog /var/log/apache2/<%= @name %>_error.log
|
|
LogLevel warn
|
|
CustomLog /var/log/apache2/<%= @name %>_access.log combined
|
|
ServerSignature Off
|
|
</VirtualHost>
|