From 9c7e80e4852590badc3d24263ba05168638fc3f0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 14 Feb 2020 22:55:21 +0000 Subject: [PATCH] Add geodns map for nominatim --- cookbooks/geodns/templates/default/config.erb | 3 +++ cookbooks/geodns/templates/default/geo.erb | 27 ++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/cookbooks/geodns/templates/default/config.erb b/cookbooks/geodns/templates/default/config.erb index 301985e92..1f582d35d 100644 --- a/cookbooks/geodns/templates/default/config.erb +++ b/cookbooks/geodns/templates/default/config.erb @@ -6,12 +6,15 @@ plugins => { geoip => { maps => { $include{config.d/tile.map} + $include{config.d/nominatim.map} } resources => { $include{config.d/tile.resource} + $include{config.d/nominatim.resource} } }, weighted => { $include{config.d/tile.weighted} + $include{config.d/nominatim.weighted} } } diff --git a/cookbooks/geodns/templates/default/geo.erb b/cookbooks/geodns/templates/default/geo.erb index 7f33a3760..942f4697b 100644 --- a/cookbooks/geodns/templates/default/geo.erb +++ b/cookbooks/geodns/templates/default/geo.erb @@ -1,18 +1,19 @@ $TTL 86400 -@ SOA a.ns.openstreetmap.org. hostmaster.openstreetmap.org. ( - 1 ; serial - 86400 ; refresh - 172800 ; retry - 604800 ; expire - 3600 ; ncache +@ SOA a.ns.openstreetmap.org. hostmaster.openstreetmap.org. ( + 2 ; serial + 86400 ; refresh + 172800 ; retry + 604800 ; expire + 3600 ; ncache ) -@ 86400 NS a.ns.openstreetmap.org. -@ 86400 NS b.ns.openstreetmap.org. -@ 86400 NS c.ns.openstreetmap.org. -@ 86400 NS d.ns.openstreetmap.org. -@ 86400 NS e.ns.openstreetmap.org. -@ 86400 NS f.ns.openstreetmap.org. +@ 86400 NS a.ns.openstreetmap.org. +@ 86400 NS b.ns.openstreetmap.org. +@ 86400 NS c.ns.openstreetmap.org. +@ 86400 NS d.ns.openstreetmap.org. +@ 86400 NS e.ns.openstreetmap.org. +@ 86400 NS f.ns.openstreetmap.org. -tile 600 DYNC geoip!tile +tile 600 DYNC geoip!tile +nominatim 600 DYNC geoip!nominatim -- 2.43.2