geodns: enable include_optional_ns to please picky DNS servers

[chef.git] / roles / grifon.rb

diff --git a/roles/grifon.rb b/roles/grifon.rb
index 04c43ec17fbd9c5e6733da01b9ee463b399c61b5..c9653f93d0aa2346b88419fd08a13dd573ef2bef 100644 (file)
--- a/roles/grifon.rb
+++ b/roles/grifon.rb
@@ -10,7 +10,7 @@ default_attributes(
     }
   },
   :hosted_by => "Grifon",
     }
   },
   :hosted_by => "Grifon",

-  :location => "Paris, France",
+  :location => "Rennes, France",

   :munin => {
     :allow => ["2a00:5884::8"]
   },
   :munin => {
     :allow => ["2a00:5884::8"]
   },


@@ -19,7 +19,7 @@ default_attributes(
       :inet6 => [
         {
           :action => "ACCEPT",
       :inet6 => [
         {
           :action => "ACCEPT",

-          :source => "net:[2a00:5884::7]",
+          :source => "net:[2a00:5884::8]",

           :dest => "fw",
           :proto => "tcp",
           :dest_ports => "munin",
           :dest => "fw",
           :proto => "tcp",
           :dest_ports => "munin",


@@ -29,12 +29,7 @@ default_attributes(
         }
       ]
     },
         }
       ]
     },

-    :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "grf"
-      }
-    }
+    :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"]

   }
 )
 
   }
 )