Redirect welcome alias to primary site

diff --git a/cookbooks/foundation/templates/default/apache.welcome.erb b/cookbooks/foundation/templates/default/apache.welcome.erb
index 581fb4eab6c8ab5118483deaceb789803460c8f7..58652608593f5d052cbfe43c0c281f93fd824131 100644 (file)
--- a/cookbooks/foundation/templates/default/apache.welcome.erb
+++ b/cookbooks/foundation/templates/default/apache.welcome.erb
@@ -1,38 +1,53 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:443>
-   ServerName <%= @name %>
+<VirtualHost *:80>
+  ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
-   ServerAlias <%= alias_name %>
+  ServerAlias <%= alias_name %>
 <% end -%>
-   ServerAdmin webmaster@openstreetmap.org
+  ServerAdmin webmaster@openstreetmap.org
 
-   CustomLog /var/log/apache2/<%= @name %>-access.log combined
-   ErrorLog /var/log/apache2/<%= @name %>-error.log
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-   SSLEngine on
-   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
-   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
 
-   # Let the backend know we are using HTTPS
-   RequestHeader set X-Forwarded-Proto “https”
-   RequestHeader set X-Forwarded-Port “443”
+<% unless @aliases.empty? -%>
+<VirtualHost *:443>
+  ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+  ServerAdmin webmaster@openstreetmap.org
 
-   ProxyPass / http://localhost:<%= @docker_external_port %>/
-   ProxyPreserveHost on
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
-</VirtualHost>
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-<VirtualHost *:80>
-   ServerName <%= @name %>
-<% @aliases.each do |alias_name| -%>
-   ServerAlias <%= alias_name %>
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
 <% end -%>
-   ServerAdmin webmaster@openstreetmap.org
 
-   CustomLog /var/log/apache2/<%= @name %>-access.log combined
-   ErrorLog /var/log/apache2/<%= @name %>-error.log
+<VirtualHost *:443>
+  ServerName <%= @name %>
+  ServerAdmin webmaster@openstreetmap.org
+
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+  # Let the backend know we are using HTTPS
+  RequestHeader set X-Forwarded-Proto "https"
+  RequestHeader set X-Forwarded-Port "443"
 
-   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-   RedirectPermanent / https://<%= @name %>/
+  ProxyPass / http://localhost:<%= @docker_external_port %>/
+  ProxyPreserveHost on
 </VirtualHost>