Restore spike-06 and drop spike-07

[dns.git] / Makefile

diff --git a/Makefile b/Makefile
index e46c31f2ccf48cfcc02c4b7544e7f229d1e2bb22..247eec2d88c3150e570beb765798c08407494c81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,39 @@
-preview: preview_cloudflare
+preview: check preview_dnscontrol

 
 

-preview_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
-       dnscontrol preview
+preview_dnscontrol: check_dnscontrol sshfp gdns
+       dnscontrol --diff2 preview

 
 

-update: update_cloudflare update_geodns
+check: check_dnscontrol

 
 

-update_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
-       dnscontrol push --providers cloudflare
+check_dnscontrol: sshfp gdns
+       dnscontrol --diff2 check

 
 

-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}
+update: update_dnscontrol update_geodns

 
 

-clean:
-       rm -f includes/* json/* origins/* gdns/*
+update_primary: update_dnscontrol_primary update_geodns

 
 

-lib/countries.xml:
-       curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
+update_dnscontrol: sshfp gdns
+       dnscontrol --diff2 push
+
+update_dnscontrol_primary: sshfp gdns
+       dnscontrol --diff2 push --domains openstreetmap.org
+
+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
 
        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
+gdns: gdns_nominatim

 
 

-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.yml
-       bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap.yml tile origins/render.openstreetmap.yml tile
+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

 
 

-include/render.js json/render.openstreetmap.org.json&: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml
-       bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml render origins/tile-total.openstreetmap.yml
+clean:
+       rm -f includes/* json/* origins/* gdns/*

 
 

-origins/nominatim.openstreetmap.yml&: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
-       bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml
+lib/countries.xml:
+       curl -s -o $@ http://api.geonames.org/countryInfo?username=demo

 
 

-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.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 requests/nominatim.openstreetmap.yml
+       bin/mkcountries requests/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml