X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8604bd193412c0bf604d8b8e38b76d0e350f107c..26eeab924cfb9f5f9289b5dcc1860d9bc9afe6ff:/cookbooks/cgiirc/templates/default/apache.erb?ds=sidebyside

diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb
index 025892c74..1afb107ba 100644
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -1,27 +1,64 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+<VirtualHost *:443>
+  ServerName <%= @name %>
+  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
+
+  DocumentRoot /usr/lib/cgi-bin/cgiirc
+  DirectoryIndex irc.cgi
+  Alias /images /usr/share/images/cgiirc
+
+  <Directory "/usr/lib/cgi-bin/cgiirc">
+    AddHandler cgi-script .cgi
+    Require all granted
+  </Directory>
+
+  <Directory "/usr/share/images/cgiirc">
+    Require all granted
+  </Directory>
+
+  <IfModule mod_deflate.c>
+    RemoveOutputFilter DEFLATE
+    SetEnv no-gzip
+  </IfModule>
+</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 %>
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
 	ServerAdmin webmaster@openstreetmap.org
 
 	CustomLog /var/log/apache2/<%= @name %>-access.log combined
 	ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-	DocumentRoot /usr/lib/cgi-bin/cgiirc
-	DirectoryIndex irc.cgi
-	Alias /images /usr/share/images/cgiirc
-
-	<Directory "/usr/lib/cgi-bin/cgiirc">
-		AddHandler cgi-script .cgi
-		Require all granted
-	</Directory>
-
-	<Directory "/usr/share/images/cgiirc">
-		Require all granted
-	</Directory>
-
-	<IfModule mod_deflate.c>
-		RemoveOutputFilter DEFLATE
-		SetEnv no-gzip
-	</IfModule>
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://<%= @name %>/
 </VirtualHost>