Convert gdns map build to be request based

[dns.git] / Makefile

diff --git a/Makefile b/Makefile
index e587a54ca69715ceeb87f9549cf15d061a5c8507..ee2fd7b6ac1c451ef363f514ac1a1fa6be164a56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,88 +1,34 @@
-preview: preview_bytemark preview_cloudflare
+preview: preview_cloudflare
 
-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
+preview_cloudflare: sshfp gdns
        dnscontrol preview
 
-update: update_bytemark update_cloudflare update_geodns
+update: update_cloudflare update_geodns
 
-update_bytemark: preview_bytemark
-       bin/update
+update_primary: update_cloudflare_primary update_geodns
 
-update_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
+update_cloudflare: sshfp gdns
        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
+update_cloudflare_primary: sshfp gdns
+       dnscontrol push --providers cloudflare --domains openstreetmap.org
 
-data/openstreetmap.org: src/openstreetmap
-data/openstreetmap.com: src/openstreetmap
-data/openstreetmap.net: src/openstreetmap
-data/openstreetmap.ca: src/openstreetmap
-data/openstreetmap.eu: src/openstreetmap
-data/openstreetmap.pro: src/openstreetmap
-data/openstreetmaps.org: src/openstreetmap
-data/osm.org: src/openstreetmap
-data/openmaps.org: src/openstreetmap
-data/openstreetmap.io: src/openstreetmap
-data/osm.io: src/openstreetmap
-data/openworldmap.org: src/openstreetmap
-data/freeosm.org: src/openstreetmap
-data/open-maps.org: src/openstreetmap
-data/open-maps.com: src/openstreetmap
-data/osmbugs.org: src/openstreetmap
-data/openstreetmap.uk: src/openstreetmap-uk
-data/openstreetmap.org.uk: src/openstreetmap-uk
-data/openstreetmap.co.uk: src/openstreetmap-uk
-data/openstreetmap.org.za: src/openstreetmap-za
-data/osm.org.za: src/openstreetmap-za
-data/osmfoundation.org: src/osmfoundation
-data/stateofthemap.org: src/stateofthemap
-data/stateofthemap.com: src/stateofthemap
-data/sotm.org: src/stateofthemap
-data/opengeodata.org: src/opengeodata
-data/switch2osm.org: src/switch2osm
-data/switch2osm.com: src/switch2osm
-data/stateofthemap.eu: src/stateofthemap-eu
+update_geodns: gdns
+       parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}
 
-include/sshfp.js: bin/mksshfp $(wildcard /etc/ssh/ssh_known_hosts)
+sshfp:
        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
-
-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
+gdns: gdns_nominatim
 
-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
+gdns_nominatim: lib/countries.xml origins/nominatim.openstreetmap.yml
+       bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap.yml nominatim origins/nominatim-total.openstreetmap.yml nominatim
 
-origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
-       bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml
+clean:
+       rm -f includes/* json/* origins/* gdns/*
 
-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
+lib/countries.xml:
+       curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
 
-data/%:
-       sed -r -e 's/$(notdir $<)(:|$$)/$(notdir $@)\1/g' < $< > $@
+origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml requests/nominatim.openstreetmap.yml
+       bin/mkcountries requests/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml