Don't disable loopback connection tracking on 14.04

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

diff --git a/cookbooks/stateofthemap/templates/default/apache.erb b/cookbooks/stateofthemap/templates/default/apache.erb
index 53c3a79c8260d5abbf164362671219d6270b3fda..7cea946c43929f2615c061ec1afd45b1a1f10326 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.erb
@@ -3,26 +3,33 @@
 <VirtualHost *:80>
         ServerName stateofthemap.org
         ServerAlias stateofthemap.com
+        ServerAlias sotm.org
         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
+        ServerAlias www.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 
 <VirtualHost *:443>
         ServerName stateofthemap.com
+        ServerAlias sotm.org
         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
+        ServerAlias www.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/stateofthemap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/stateofthemap.org.key
 
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
@@ -35,6 +42,8 @@
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/stateofthemap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/stateofthemap.org.key
 
         DocumentRoot /srv/stateofthemap.org/html
 </VirtualHost>