X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cf2a19d4f045022ce3d2ee494145d57e7a2fe462..699e157e3d708f38064eea9072aa210fe5ccac30:/cookbooks/web/templates/default/apache.frontend.erb?ds=sidebyside diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index f452b4fb3..e67961232 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -78,7 +78,7 @@ # https://gist.github.com/Firefishy/86ed5b86991b225179b54bbafbcd769e # RewriteCond "%{QUERY_STRING}" "^q=abcde&t=20" - RewriteRule "^/api/0\.6/notes/search$" - [R=204,L] + RewriteRule "^/api/0\.6/notes/search$" - [R=429,L] # # Force special MIME type for crossdomain.xml files @@ -200,7 +200,7 @@ - ServerName openstreetmap.org + ServerName osm.org Header always set Cache-Control "max-age=31536000" Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" @@ -210,12 +210,11 @@ RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L] RewriteCond %{REQUEST_URI} !^/server-status$ - RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent] + RewriteRule ^(.*)$ https://osm.org$1 [L,NE,R=permanent] - ServerName www.openstreetmap.org - ServerAlias * + ServerName www.osm.org Header always set Cache-Control "max-age=31536000" Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" @@ -224,15 +223,34 @@ RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L] - # HSTS Preloading requires domain name match - RewriteCond %{HTTP_HOST} =osm.org RewriteCond %{REQUEST_URI} !^/server-status$ - RewriteRule ^(.*)$ https://osm.org$1 [L,NE,R=permanent] + RewriteRule ^(.*)$ https://www.osm.org$1 [L,NE,R=permanent] + + + + ServerName openstreetmap.org + + Header always set Cache-Control "max-age=31536000" + Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" + + RewriteEngine on + + RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L] - # HSTS Preloading requires domain match - RewriteCond %{HTTP_HOST} =www.osm.org RewriteCond %{REQUEST_URI} !^/server-status$ - RewriteRule ^(.*)$ https://www.osm.org$1 [L,NE,R=permanent] + RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent] + + + + ServerName www.openstreetmap.org + ServerAlias * + + Header always set Cache-Control "max-age=31536000" + Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" + + RewriteEngine on + + RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L] RewriteCond %{REQUEST_URI} !^/server-status$ RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]