X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/75de7f924c8f67b5feae7d2666e81da94a695928..a4b54ecbcb6238430c1aab5fe4dc7ed3541e6453:/cookbooks/taginfo/templates/default/apache.erb

diff --git a/cookbooks/taginfo/templates/default/apache.erb b/cookbooks/taginfo/templates/default/apache.erb
index 3ae9fed71..82fef8b37 100644
--- a/cookbooks/taginfo/templates/default/apache.erb
+++ b/cookbooks/taginfo/templates/default/apache.erb
@@ -24,9 +24,31 @@
                 Header setifempty Access-Control-Allow-Origin *
         </Location>
 </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 *:80>
         ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+        ServerAlias <%= alias_name %>
+<% end -%>
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined