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

[chef.git] / roles / grifon.rb

diff --git a/roles/grifon.rb b/roles/grifon.rb
index 322c4fca59aaab2f646401e7973ed8caeba1e34c..054af06f1a686a5a6ef3b6ce0d0b4a5ddda43134 100644 (file)
--- a/roles/grifon.rb
+++ b/roles/grifon.rb
@@ -10,11 +10,25 @@ default_attributes(
     }
   },
   :hosted_by => "Grifon",
     }
   },
   :hosted_by => "Grifon",

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

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

+    :firewall => {
+      :inet6 => [
+        {
+          :action => "ACCEPT",
+          :source => "net:[2a00:5884::8]",
+          :dest => "fw",
+          :proto => "tcp",
+          :dest_ports => "munin",
+          :source_ports => "1024:",
+          :rate_limit => "-",
+          :connection_limit => "-"
+        }
+      ]
+    },

     :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
     :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {