X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6766749acda8c73f24cdb134f697f24942bfe50f..fda7ee22b72154e9c8c04cb7ec3f3a08d119b50a:/cookbooks/stats/templates/default/apache.erb

diff --git a/cookbooks/stats/templates/default/apache.erb b/cookbooks/stats/templates/default/apache.erb
index d6e147057..47a589afd 100644
--- a/cookbooks/stats/templates/default/apache.erb
+++ b/cookbooks/stats/templates/default/apache.erb
@@ -1,6 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<VirtualHost *:443>
 	ServerName stats.openstreetmap.org
 	ServerAlias stats.osm.org
 	ServerAdmin webmaster@openstreetmap.org
@@ -8,11 +8,33 @@
 	CustomLog /var/log/apache2/stats.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/stats.openstreetmap.org-error.log
 
+	SSLEngine on
+	SSLCertificateFile /etc/ssl/certs/stats.openstreetmap.org.pem
+	SSLCertificateKeyFile /etc/ssl/private/stats.openstreetmap.org.key
+
 	DocumentRoot <%= @directory %>
 	Alias /awstats-icon/ /usr/share/awstats/icon/
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 </VirtualHost>
 
+<VirtualHost *:80>
+	ServerName stats.openstreetmap.org
+	ServerAlias stats.osm.org
+	ServerAdmin webmaster@openstreetmap.org
+
+	CustomLog /var/log/apache2/stats.openstreetmap.org-access.log combined
+	ErrorLog /var/log/apache2/stats.openstreetmap.org-error.log
+
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://stats.openstreetmap.org/
+</VirtualHost>
+
+<Directory <%= @directory %>>
+	Options None
+	AllowOverride None
+	Require all granted
+</Directory>
+
 <Directory /var/lib/awstats>
 	Options None
 	AllowOverride None