From 42f905a1a337d4d0ccf0acb5ee0af8acc63df059 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 15 Aug 2013 09:36:42 +0100 Subject: [PATCH] Expand names at the end of lines correctly --- Makefile | 2 +- src/openstreetmap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 93fb129..f50a6b5 100644 --- 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 184f4b4..5670d03 100644 --- 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 -- 2.39.5