Remove attempt to force geodns rebuilds with --assume-new

[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..7cca3c5a1341bcd5b3344a55ecb99c5e26b762a0 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
 <VirtualHost *:80>
         ServerName stateofthemap.org
         ServerAlias stateofthemap.com

+        ServerAlias sotm.org

         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
         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
 
         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
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 
 <VirtualHost *:443>
         ServerName stateofthemap.com

+        ServerAlias sotm.org

         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
         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
         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>
 
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>


@@ -35,8 +42,15 @@
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on
         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
 
         DocumentRoot /srv/stateofthemap.org/html

+
+        ErrorDocument 404 /404.html
+
+        ExpiresActive On
+        ExpiresDefault "access plus 12 hours"

 </VirtualHost>
 
 <Directory /srv/stateofthemap.org/html>
 </VirtualHost>
 
 <Directory /srv/stateofthemap.org/html>