Drop tile geodns zone

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 43643c2f9bd0ba0d227a10d873baf0051fef575a..36813bcb4157b5189b528bfd44ff8026a6ec9ccb 100644 (file)
--- 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
 
   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
   %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 6ceafc7375cf3c407df14543470d3d9ef197325c..510e886a8641e0ae7ec294e6b456cac051c45e06 100644 (file)
--- a/cookbooks/geodns/templates/default/config.erb
+++ b/cookbooks/geodns/templates/default/config.erb
@@ -6,16 +6,13 @@ options => {
 plugins => {
   geoip => {
     maps => {
 plugins => {
   geoip => {
     maps => {

-      $include{config.d/tile.map}

       $include{config.d/nominatim.map}
     }
     resources => {
       $include{config.d/nominatim.map}
     }
     resources => {

-      $include{config.d/tile.resource}

       $include{config.d/nominatim.resource}
     }
   },
   weighted => {
       $include{config.d/nominatim.resource}
     }
   },
   weighted => {

-    $include{config.d/tile.weighted}

     $include{config.d/nominatim.weighted}
   }
 }
     $include{config.d/nominatim.weighted}
   }
 }

diff --git a/cookbooks/geodns/templates/default/geo.erb b/cookbooks/geodns/templates/default/geo.erb
index 9e306421879f7f5e09868043ca18d98f021d1796..ae47b3448d8358e1b1ca476cd380d201959a0bc0 100644 (file)
--- 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.
 
 @              86400   NS      stormfly-04.openstreetmap.org.
 @              86400   NS      ridgeback.openstreetmap.org.
 

-tile           300     DYNC    geoip!tile

 nominatim      300     DYNC    geoip!nominatim
 nominatim      300     DYNC    geoip!nominatim