X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/752d776b04ca8835b943efd4aabc2e60f2e1c3cd..9b2abddf2004a1424175886a6e853304717cb0fe:/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 ea6ada67b..780e54784 100644
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -1,9 +1,13 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<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
 
@@ -13,6 +17,11 @@
 
 	<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>
@@ -20,3 +29,14 @@
 		SetEnv no-gzip
 	</IfModule>
 </VirtualHost>
+
+<VirtualHost *:80>
+	ServerName <%= @name %>
+	ServerAdmin webmaster@openstreetmap.org
+
+	CustomLog /var/log/apache2/<%= @name %>-access.log combined
+	ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://<%= @name %>/
+</VirtualHost>