X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/feea016a2ed28e000a53d297dbd8d8b97b6e3eb4..41fe9fb8e0d9433730b8a94d231a9e0652ff296f:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index e46c31f..af5e109 100644
--- 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
+preview_dnscontrol: check_dnscontrol sshfp gdns
 	dnscontrol 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 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 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}
 
-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
+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