X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..a9bcfed7afd3f7cf5a39b6ce44b2b9bda03b3b53:/cookbooks/blog/templates/default/opengeodata.erb?ds=inline
diff --git a/cookbooks/blog/templates/default/opengeodata.erb b/cookbooks/blog/templates/default/opengeodata.erb
index 43dbf01bd..1150145a4 100644
--- a/cookbooks/blog/templates/default/opengeodata.erb
+++ b/cookbooks/blog/templates/default/opengeodata.erb
@@ -3,7 +3,7 @@
ServerName opengeodata.org
ServerAlias www.opengeodata.org
- ServerAlias old.opengeodata.org
+ ServerAlias old.opengeodata.org # https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/
ServerAdmin webmaster@openstreetmap.org
@@ -11,7 +11,28 @@
ErrorLog /var/log/apache2/<%= @name %>-error.log
RewriteEngine on
- RewriteRule ^(.*/)index\.html$ http://blog.openstreetmap.org/$1 [R,L]
+ RewriteRule ^(.*/)index\.html$ https://blog.openstreetmap.org/$1 [R=permanent,L]
- RedirectPermanent / http://blog.openstreetmap.org/
+ RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+ RedirectPermanent / https://blog.openstreetmap.org/
+
+
+
+ ServerName opengeodata.org
+ ServerAlias www.opengeodata.org
+ ServerAlias old.opengeodata.org # https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/
+
+ ServerAdmin webmaster@openstreetmap.org
+
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/opengeodata.org.pem
+ SSLCertificateKeyFile /etc/ssl/private/opengeodata.org.key
+
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+ RewriteEngine on
+ RewriteRule ^(.*/)index\.html$ https://blog.openstreetmap.org/$1 [R=permanent,L]
+
+ RedirectPermanent / https://blog.openstreetmap.org/