Revert "Drop stormfly-04 from nominatim"

[dns.git] / Makefile

diff --git a/Makefile b/Makefile
index 8c520d3f370c35684915288f8145cf6082662908..af5e109acae2d580f16aea781f8bfd5ac7764cc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,39 @@
-all: data/openstreetmap.org data/openstreetmap.com data/openstreetmap.net \
-     data/openstreetmap.ca 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/openstreetmap.org.uk data/openstreetmap.co.uk \
-     data/osmfoundation.org data/stateofthemap.org data/stateofthemap.com \
-     data/stateofthemap.eu \
-     data/opengeodata.org \
-     data/switch2osm.org data/switch2osm.com \
-     data/tile.openstreetmap.org
+preview: check preview_dnscontrol
 
-clean:
-       rm lib/countries.xml data/*
+preview_dnscontrol: check_dnscontrol sshfp gdns
+       dnscontrol preview
+
+check: check_dnscontrol
+
+check_dnscontrol: sshfp gdns
+       dnscontrol check
+
+update: update_dnscontrol update_geodns
+
+update_primary: update_dnscontrol_primary update_geodns
+
+update_dnscontrol: sshfp gdns
+       dnscontrol push
 
-update: all
-       bin/update
+update_dnscontrol_primary: sshfp gdns
+       dnscontrol push --domains openstreetmap.org
+
+update_geodns: gdns
+       parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}
+
+sshfp:
+       bin/mksshfp
+
+gdns: gdns_nominatim
+
+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
+
+clean:
+       rm -f includes/* json/* origins/* gdns/*
 
 lib/countries.xml:
        curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
 
-data/openstreetmap.org: src/openstreetmap
-data/openstreetmap.com: src/openstreetmap
-data/openstreetmap.net: src/openstreetmap
-data/openstreetmap.ca: 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/openstreetmap.org.uk: src/openstreetmap-uk
-data/openstreetmap.co.uk: src/openstreetmap-uk
-data/osmfoundation.org: src/osmfoundation
-data/stateofthemap.org: src/stateofthemap
-data/stateofthemap.com: src/stateofthemap
-data/opengeodata.org: src/opengeodata
-data/switch2osm.org: src/switch2osm
-data/switch2osm.com: src/switch2osm
-data/stateofthemap.eu: src/stateofthemap-eu
-
-data/tile.openstreetmap.org json/tile.openstreetmap.org.json: src/tile.openstreetmap bandwidth/tile.openstreetmap.yml bin/mkgeo lib/countries.xml
-       bin/mkgeo tile.openstreetmap tile.openstreetmap.org
-
-data/%:
-       sed -e 's/$(notdir $<):/$(notdir $@):/g' < $< > $@
+origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml requests/nominatim.openstreetmap.yml
+       bin/mkcountries requests/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml