X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7a0adccf14d7904d35c06822ae0c4ffffbeb740a..c107cf7b86ae648420fe5aa7aa80c5fa39b74452:/cookbooks/osqa/templates/default/apache.erb

diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index 71ae69b7b..546067b56 100644
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -4,6 +4,9 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
 
 <VirtualHost *:80>
         ServerName <%= @name %>
+        <% @aliases.each do |alias_name| -%>
+                ServerAlias <%= alias_name %>
+        <% end -%>
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
@@ -12,6 +15,25 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
         RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
+<% unless @aliases.empty? -%>
+
+<VirtualHost *:443>
+        ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>
+        ServerAlias <%= alias_name %>
+<% end -%>
+        ServerAdmin webmaster@openstreetmap.org
+
+        SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+        SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+        CustomLog /var/log/apache2/<%= @name %>-access.log combined
+        ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+        RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+<% end -%>
 
 <VirtualHost *:443>
         ServerName <%= @name %>