X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a3ba209e2540e3a2488e9735e4ce3069ab8a3e22..9f8c68c388d4ce13634121e808ca06cca75f9501:/cookbooks/stateofthemap/templates/default/apache.erb?ds=sidebyside
diff --git a/cookbooks/stateofthemap/templates/default/apache.erb b/cookbooks/stateofthemap/templates/default/apache.erb
index 53c3a79c8..7cca3c5a1 100644
--- a/cookbooks/stateofthemap/templates/default/apache.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.erb
@@ -3,26 +3,33 @@
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/
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/
@@ -35,8 +42,15 @@
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
+
+ ErrorDocument 404 /404.html
+
+ ExpiresActive On
+ ExpiresDefault "access plus 12 hours"