Merge remote-tracking branch 'github/pull/447'

[chef.git] / cookbooks / geodns / templates / default / config.erb

diff --git a/cookbooks/geodns/templates/default/config.erb b/cookbooks/geodns/templates/default/config.erb
index 301985e92df1a31d1360a590a21ce478b92793ab..6ceafc7375cf3c407df14543470d3d9ef197325c 100644 (file)
--- a/cookbooks/geodns/templates/default/config.erb
+++ b/cookbooks/geodns/templates/default/config.erb
@@ -1,4 +1,5 @@
 options => {
 options => {

+  include_optional_ns = true

   listen => [ <%= node.ipaddresses(:role => :external).join(", ") %> ]
 }
         
   listen => [ <%= node.ipaddresses(:role => :external).join(", ") %> ]
 }
         


@@ -6,12 +7,15 @@ plugins => {
   geoip => {
     maps => {
       $include{config.d/tile.map}
   geoip => {
     maps => {
       $include{config.d/tile.map}

+      $include{config.d/nominatim.map}

     }
     resources => {
       $include{config.d/tile.resource}
     }
     resources => {
       $include{config.d/tile.resource}

+      $include{config.d/nominatim.resource}

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

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

   }
 }
   }
 }