Restore spike-06 and drop spike-07

[dns.git] / Makefile

diff --git a/Makefile b/Makefile
index 1533612b3fd775d33da59d792aa7b4fba5962c22..af5e109acae2d580f16aea781f8bfd5ac7764cc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,22 @@
-preview: preview_cloudflare
+preview: check preview_dnscontrol

 
 

-preview_cloudflare: sshfp gdns
+preview_dnscontrol: check_dnscontrol sshfp gdns

        dnscontrol preview
 
        dnscontrol preview
 

-update: update_cloudflare update_geodns
+check: check_dnscontrol

 
 

-update_cloudflare: sshfp gdns
-       dnscontrol push --providers cloudflare
+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_dnscontrol_primary: sshfp gdns
+       dnscontrol push --domains openstreetmap.org

 
 update_geodns: gdns
        parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}
 
 update_geodns: gdns
        parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}


@@ -14,13 +24,7 @@ update_geodns: gdns
 sshfp:
        bin/mksshfp
 
 sshfp:
        bin/mksshfp
 

-gdns: gdns_tile gdns_render gdns_nominatim
-
-gdns_tile: lib/countries.xml origins/tile.openstreetmap.yml
-       bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap.yml tile origins/render.openstreetmap.yml tile
-
-gdns_render: lib/countries.xml origins/render.openstreetmap.yml
-       bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml render origins/tile-total.openstreetmap.yml
+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
 
 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


@@ -31,10 +35,5 @@ clean:
 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
 

-origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
-       bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml
-
-origins/render.openstreetmap.yml: gdns_tile
-
-origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
-       bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml
+origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml requests/nominatim.openstreetmap.yml
+       bin/mkcountries requests/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml