diff --git a/README.md b/README.md index edae890..51e0c4b 100644 --- a/README.md +++ b/README.md @@ -126,13 +126,6 @@ There are three public buckets: - https://planet.openfreemap.com - full planet runs. index: [dirs](https://planet.openfreemap.com/dirs.txt), [files](https://planet.openfreemap.com/index.txt) - https://monaco.openfreemap.com - identical runs to the full planet, but only for Monaco area. Very tiny, ideal for development. index: [dirs](https://monaco.openfreemap.com/dirs.txt), [files](https://monaco.openfreemap.com/index.txt) -### Domains and Cloudflare - -- `tiles.openfreemap.org` - Cloudflare proxied -- `direct.openfreemap.org` - direct connection, Round-Robin DNS - -The project has been designed in such a way that we can migrate away from Cloudflare if needed. This is the reason why there are a .com and a .org domain: the .com will always stay on Cloudflare to host the R2 buckets, while the .org domain is independent. - ### What about PMTiles? I would have loved to use PMTiles; they are a brilliant idea! diff --git a/scripts/http_host/http_host_lib/nginx.py b/scripts/http_host/http_host_lib/nginx.py index ddb9c19..3bd626e 100644 --- a/scripts/http_host/http_host_lib/nginx.py +++ b/scripts/http_host/http_host_lib/nginx.py @@ -20,7 +20,7 @@ def write_nginx_config(): domain_le = HOST_CONFIG['domain_le'] domain_ledns = HOST_CONFIG['domain_ledns'] - # processing Cloudflare config + # processing Round Robin DNS config if domain_ledns: if not (OFM_CONFIG_DIR / 'rclone.conf').is_file(): sys.exit('rclone.conf missing') diff --git a/ssh_lib/assets/nginx/cloudflare.conf b/ssh_lib/assets/nginx/cloudflare.conf deleted file mode 100644 index e3307f3..0000000 --- a/ssh_lib/assets/nginx/cloudflare.conf +++ /dev/null @@ -1,29 +0,0 @@ -# https://www.cloudflare.com/ips/ - -set_real_ip_from 103.21.244.0/22; -set_real_ip_from 103.22.200.0/22; -set_real_ip_from 103.31.4.0/22; -set_real_ip_from 104.16.0.0/13; -set_real_ip_from 104.24.0.0/14; -set_real_ip_from 108.162.192.0/18; -set_real_ip_from 131.0.72.0/22; -set_real_ip_from 141.101.64.0/18; -set_real_ip_from 162.158.0.0/15; -set_real_ip_from 172.64.0.0/13; -set_real_ip_from 173.245.48.0/20; -set_real_ip_from 188.114.96.0/20; -set_real_ip_from 190.93.240.0/20; -set_real_ip_from 197.234.240.0/22; -set_real_ip_from 198.41.128.0/17; - -set_real_ip_from 2400:cb00::/32; -set_real_ip_from 2405:8100::/32; -set_real_ip_from 2405:b500::/32; -set_real_ip_from 2606:4700::/32; -set_real_ip_from 2803:f800::/32; -set_real_ip_from 2a06:98c0::/29; -set_real_ip_from 2c0f:f248::/32; - -# use any of the following two -real_ip_header CF-Connecting-IP; -#real_ip_header X-Forwarded-For; diff --git a/ssh_lib/nginx.py b/ssh_lib/nginx.py index 800def2..82a6984 100644 --- a/ssh_lib/nginx.py +++ b/ssh_lib/nginx.py @@ -50,7 +50,7 @@ def nginx(c): put(c, f'{ASSETS_DIR}/nginx/nginx.conf', '/etc/nginx/') put(c, f'{ASSETS_DIR}/nginx/mime.types', '/etc/nginx/') put(c, f'{ASSETS_DIR}/nginx/default_disable.conf', '/data/nginx/sites') - put(c, f'{ASSETS_DIR}/nginx/cloudflare.conf', '/data/nginx/config') + # put(c, f'{ASSETS_DIR}/nginx/cloudflare.conf', '/data/nginx/config') sudo_cmd(c, 'curl https://ssl-config.mozilla.org/ffdhe2048.txt -o /etc/nginx/ffdhe2048.txt') diff --git a/website/src/content/index/rest.md b/website/src/content/index/rest.md index 110c207..5cbccb2 100644 --- a/website/src/content/index/rest.md +++ b/website/src/content/index/rest.md @@ -40,12 +40,6 @@ Special thanks go to [Michael Barry](https://github.com/msbarry) for developing The [styles](https://github.com/hyperknot/openfreemap-styles) are forked and heavily modified. -## Domains - -`tiles.openfreemap.org` - Cloudflare proxied - -`direct.openfreemap.org` - direct connection, Round-Robin DNS - ## Attribution Attribution is required. If you are using MapLibre, they are automatically added, you have nothing to do.