From 2922683cd6d587cc78e13d17de1f7b07c2203383 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 2 Jul 2022 17:15:35 +0100 Subject: [PATCH] Drop tile geodns zone --- cookbooks/geodns/recipes/default.rb | 2 +- cookbooks/geodns/templates/default/config.erb | 3 --- cookbooks/geodns/templates/default/geo.erb | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb index 43643c2f9..36813bcb4 100644 --- a/cookbooks/geodns/recipes/default.rb +++ b/cookbooks/geodns/recipes/default.rb @@ -29,7 +29,7 @@ directory "/etc/gdnsd/config.d" do mode "755" end -%w[tile nominatim].each do |zone| +%w[nominatim].each do |zone| %w[map resource weighted].each do |type| template "/etc/gdnsd/config.d/#{zone}.#{type}" do action :create_if_missing diff --git a/cookbooks/geodns/templates/default/config.erb b/cookbooks/geodns/templates/default/config.erb index 6ceafc737..510e886a8 100644 --- a/cookbooks/geodns/templates/default/config.erb +++ b/cookbooks/geodns/templates/default/config.erb @@ -6,16 +6,13 @@ options => { 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 9e3064218..ae47b3448 100644 --- a/cookbooks/geodns/templates/default/geo.erb +++ b/cookbooks/geodns/templates/default/geo.erb @@ -15,5 +15,4 @@ $TTL 86400 @ 86400 NS stormfly-04.openstreetmap.org. @ 86400 NS ridgeback.openstreetmap.org. -tile 300 DYNC geoip!tile nominatim 300 DYNC geoip!nominatim -- 2.39.5