Expand names at the end of lines correctly

diff --git a/Makefile b/Makefile
index 93fb129c1bd38b9f7362278b99cf1cc139b59834..f50a6b51a6248d1ac20106b319c7f330a77a684a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,4 +54,4 @@ data/render.openstreetmap.org json/render.openstreetmap.org.json: bin/mkgeo orig
        bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap render.openstreetmap.org
 
 data/%:
-       sed -e 's/$(notdir $<):/$(notdir $@):/g' < $< > $@
+       sed -r -e 's/$(notdir $<)(:|$$)/$(notdir $@)\1/g' < $< > $@

diff --git a/src/openstreetmap b/src/openstreetmap
index 184f4b4c2117d043491ad764890619a93499bbe5..5670d0398a124e7dde512ebc581d2cfc9327cc38 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -28,13 +28,13 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 # Delegate geo.openstreetmap.org to PowerDNS
 
 # shenron.openstreetmap.org
-&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:3600
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap
 # nadder-02.openstreetmap.org
-&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap:3600
+&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
 # fume.openstreetmap.org
-&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap:3600
+&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
 # bunyip.openstreetmap.org
-&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap:3600
+&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap
 
 # Main web servers and their aliases