tilecache: remove trogdor as peer from angor

[chef.git] / cookbooks / stats / templates / default / apache.erb

diff --git a/cookbooks/stats/templates/default/apache.erb b/cookbooks/stats/templates/default/apache.erb
index 328b89b784f83e46d54e43237639331343e1917e..47a589afdcfc9a019df9ac7cf431afd81a7e7acd 100644 (file)
--- 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,21 +8,41 @@
        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
-       Order allow,deny
-       Allow from all
+       Require all granted
 </Directory>
 
 <Directory /usr/share/awstats/icon>
        Options None
        AllowOverride None
-       Order allow,deny
-       Allow from all
+       Require all granted
 </Directory>