Add geodns map for nominatim

[dns.git] / Makefile

diff --git a/Makefile b/Makefile
index 4cc2d7cbb0873ae3c002fca6233c67ba93644413..e587a54ca69715ceeb87f9549cf15d061a5c8507 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,37 @@
-all: data/openstreetmap.org data/openstreetmap.com data/openstreetmap.net \
-     data/openstreetmap.ca data/openstreetmap.eu data/openstreetmap.pro \
-     data/openstreetmaps.org data/osm.org data/openmaps.org \
-     data/openstreetmap.io data/osm.io \
-     data/openworldmap.org data/freeosm.org data/open-maps.org data/open-maps.com data/osmbugs.org \
-     data/openstreetmap.uk data/openstreetmap.org.uk data/openstreetmap.co.uk \
-     data/openstreetmap.org.za data/osm.org.za \
-     data/osmfoundation.org \
-     data/stateofthemap.org data/stateofthemap.com data/sotm.org \
-     data/stateofthemap.eu \
-     data/opengeodata.org \
-     data/switch2osm.org data/switch2osm.com \
-     data/tile.openstreetmap.org \
-     data/render.openstreetmap.org
+preview: preview_bytemark preview_cloudflare

 
 

-clean:
-       rm -f data/* json/* origins/*
+preview_bytemark: data/openstreetmap.org data/openstreetmap.com data/openstreetmap.net \
+                 data/openstreetmap.ca data/openstreetmap.eu data/openstreetmap.pro \
+                 data/openstreetmaps.org data/osm.org data/openmaps.org \
+                 data/openstreetmap.io data/osm.io \
+                 data/openworldmap.org data/freeosm.org data/open-maps.org data/open-maps.com data/osmbugs.org \
+                 data/openstreetmap.uk data/openstreetmap.org.uk data/openstreetmap.co.uk \
+                 data/openstreetmap.org.za data/osm.org.za \
+                 data/osmfoundation.org \
+                 data/stateofthemap.org data/stateofthemap.com data/sotm.org \
+                 data/stateofthemap.eu \
+                 data/opengeodata.org \
+                 data/switch2osm.org data/switch2osm.com \
+                 data/tile.openstreetmap.org \
+                 data/render.openstreetmap.org \
+                 data/nominatim.openstreetmap.org
+
+preview_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
+       dnscontrol preview

 
 

-update: update_bytemark update_geodns
+update: update_bytemark update_cloudflare update_geodns

 
 

-update_bytemark: all
+update_bytemark: preview_bytemark

        bin/update
 
        bin/update
 

-update_geodns: all
-       parallel --will-cite rsync --quiet --recursive gdns/ {}::geodns ::: ${GEODNS_SERVERS}
+update_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
+       dnscontrol push --providers cloudflare
+
+update_geodns: gdns/tile.map gdns/tile.resource gdns/tile.weighted gdns/nominatim.map gdns/nominatim.resource gdns/nominatim.weighted
+       parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}
+
+clean:
+       rm -f data/* json/* origins/* gdns/*

 
 lib/countries.xml:
        curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
 
 lib/countries.xml:
        curl -s -o $@ http://api.geonames.org/countryInfo?username=demo


@@ -57,14 +66,23 @@ data/switch2osm.org: src/switch2osm
 data/switch2osm.com: src/switch2osm
 data/stateofthemap.eu: src/stateofthemap-eu
 
 data/switch2osm.com: src/switch2osm
 data/stateofthemap.eu: src/stateofthemap-eu
 

+include/sshfp.js: bin/mksshfp $(wildcard /etc/ssh/ssh_known_hosts)
+       bin/mksshfp
+

 origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
        bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml
 
 origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
        bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml
 

-data/tile.openstreetmap.org json/tile.openstreetmap.org.json origins/render.openstreetmap.yml: bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap
-       bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap tile.openstreetmap.org origins/render.openstreetmap.yml tile
+data/tile.openstreetmap.org include/tile.js json/tile.openstreetmap.org.json origins/render.openstreetmap.yml gdns/tile.map gdns/tile.resource gdns/tile.weighted: bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap
+       bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap tile.openstreetmap.org tile origins/render.openstreetmap.yml tile
+
+data/render.openstreetmap.org include/render.js json/render.openstreetmap.org.json: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap
+       bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap render.openstreetmap.org render origins/tile-total.openstreetmap.yml
+
+origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
+       bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml

 
 

-data/render.openstreetmap.org json/render.openstreetmap.org.json: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap
-       bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap render.openstreetmap.org origins/total.openstreetmap.yml
+data/nominatim.openstreetmap.org include/nominatim.js json/nominatim.openstreetmap.org.json origins/nominatim-total.openstreetmap.yml gdns/nominatim.map gdns/nominatim.resource gdns/nominatim.weighted: bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap
+       bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap nominatim.openstreetmap.org nominatim origins/nominatim-total.openstreetmap.yml nominatim

 
 data/%:
        sed -r -e 's/$(notdir $<)(:|$$)/$(notdir $@)\1/g' < $< > $@
 
 data/%:
        sed -r -e 's/$(notdir $<)(:|$$)/$(notdir $@)\1/g' < $< > $@