X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/476dc11df9409a37e21e1c0a3ce34af15f663e69..18db4c72edea0d2cd4df5b7d7d9011df618d0ff9:/cookbooks/tile/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 0e461b8d6..9652ec825 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -20,11 +20,9 @@ ScriptAlias /cgi-bin/ /srv/tile.openstreetmap.org/cgi-bin/ # Get the real remote IP for requests via a trusted proxy - RemoteIPHeader X-Forwarded-For -<% @caches.each do |cache| -%> -<% cache.ipaddresses(:role => :external).sort.each do |address| -%> + RemoteIPHeader Fastly-Client-IP +<% @fastly.sort.each do |address| -%> RemoteIPTrustedProxy <%= address %> -<% end -%> <% end -%> # Setup logging @@ -61,6 +59,33 @@ # Redirect ACME certificate challenges RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + + # Restrict tile access to CDN nodes and admins + + Require expr "%{CONN_REMOTE_ADDR} != %{REMOTE_ADDR}" + # Fastly POPs +<% @fastly.sort.each do |address| -%> + Require ip <%= address %> +<% end -%> + # StatusCake monitoring +<% @statuscake.sort.reject { |address| address.empty? }.each do |address| -%> + Require ip <%= address %> +<% end -%> + # Administrators +<% @admins.sort.each do |address| -%> + Require ip <%= address %> +<% end -%> + # OSM Amsterdam IPv4 + Require ip 184.104.179.128/27 + # OSM Amsterdam IPv6 + Require ip 2001:470:1:fa1::/64 + # OSM Dublin IPv4 + Require ip 184.104.226.96/27 + # OSM Dublin IPv6 + Require ip 2001:470:1:b3b::/64 + # OSM UCL IPv4 + Require ip 193.60.236.0/24 + @@ -70,14 +95,6 @@ ServerAlias render.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - # Get the real remote IP for requests via a trusted proxy - RemoteIPHeader X-Forwarded-For -<% @caches.each do |cache| -%> -<% cache.ipaddresses(:role => :external).sort.each do |address| -%> - RemoteIPTrustedProxy <%= address %> -<% end -%> -<% end -%> - # Setup logging LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_with_remoteip CustomLog /var/log/apache2/access.log combined_with_remoteip