nominatim: reintroduce https forwarding

[chef.git] / cookbooks / nominatim / templates / default / nginx.erb

diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index 7790270b744e0eeb13214672e4981b02e3bbebe4..ef0a2fdc8a215a0ea1f23df0e219c813116677f4 100644 (file)
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -17,23 +17,17 @@ upstream nominatim_service {
 }
 
 # Whitelisted IPs
 }
 
 # Whitelisted IPs

-geo $limit {
-    default 1;
-    2001:978:2:2c::172:6 0;
-    2001:978:2:2c::172:7 0;
-    2001:978:2:2c::172:8 0;
-    2001:978:2:2c::172:b 0;
-    2001:978:2:2c::172:c 0;
-    2001:978:2:2c::172:d 0;
-    130.117.76.6 0;
-    130.117.76.7 0;
-    130.117.76.8 0;
-    89.16.162.21 0;
-    89.16.162.22 0;
-    46.235.224.148 0;
-    209.132.180.180 0;
-    209.132.180.168 0;
-    8.43.85.23 0; # gnome
+geo $whitelisted {
+    default 0;
+<% @frontends.each do |frontend| -%>
+<% frontend.ipaddresses(:role => :external) do |address| -%>
+    <%= address %> 1;
+<% end -%>
+<% end -%>
+    46.235.224.148 1;
+    209.132.180.180 1;
+    209.132.180.168 1;
+    8.43.85.23 1; # gnome

 }
 
 map $http_user_agent $blocked_user_agent {
 }
 
 map $http_user_agent $blocked_user_agent {


@@ -46,9 +40,9 @@ map $http_referer $blocked_referrer {
    include <%= @confdir %>/nginx_blocked_referrer.conf;
 }
 
    include <%= @confdir %>/nginx_blocked_referrer.conf;
 }
 

-map $limit $limit_key {
-    0 "";
-    1 $binary_remote_addr;
+map $whitelisted $limit_www {
+    1 "";
+    0 $binary_remote_addr;

 }
 
 map $blocked_user_agent $limit_tarpit {
 }
 
 map $blocked_user_agent $limit_tarpit {


@@ -57,16 +51,33 @@ map $blocked_user_agent $limit_tarpit {
     2 $binary_remote_addr;
 }
 
     2 $binary_remote_addr;
 }
 

-limit_req_zone $limit zone=www:50m rate=2r/s;
+limit_req_zone $limit_www zone=www:50m rate=2r/s;

 limit_req_zone $limit_tarpit zone=tarpit:10m rate=1r/s;
 limit_req_zone $binary_remote_addr zone=blocked:10m rate=20r/m;
 
 limit_req_zone $limit_tarpit zone=tarpit:10m rate=1r/s;
 limit_req_zone $binary_remote_addr zone=blocked:10m rate=20r/m;
 

+server {
+  listen 80 default_server;
+  listen [::]:80 default_server;
+
+  location /nginx_status {
+        stub_status on;
+        access_log   off;
+        allow 127.0.0.1;
+        allow ::1;
+        deny all;
+    }
+
+   rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;
+
+   location / {
+       return 301 https://$host$request_uri;
+   }
+}
+

 server {
     # IPv4
 server {
     # IPv4

-    listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;

     listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
     # IPv6
     listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
     # IPv6

-    listen       [::]:80 deferred backlog=16384 reuseport fastopen=2048 default_server;

     listen       [::]:443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
     server_name  localhost;
 
     listen       [::]:443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
     server_name  localhost;
 


@@ -98,7 +109,7 @@ server {
     }
 
     location / {
     }
 
     location / {

-        set $anyid = $http_referer$http_user_agent$email_id;
+        set $anyid $http_referer$http_user_agent$email_id;

         if ($anyid = "")
         { return 403; }
         if ($blocked_user_agent ~ ^2$)
         if ($anyid = "")
         { return 403; }
         if ($blocked_user_agent ~ ^2$)