Explcitly disable IPv6 on the IC internal network

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 9eebca8c724b70fc89600cd8af305738d7df4234..67d7bcf3e0ad667324e22fa87bffcd15c4a11c31 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -23,20 +23,25 @@
 require "ipaddr"
 
 node[:networking][:interfaces].each do |name, interface|
 require "ipaddr"
 
 node[:networking][:interfaces].each do |name, interface|

-  if interface[:role] && role = node[:networking][:roles][interface[:role]]
+  if interface[:role] && (role = node[:networking][:roles][interface[:role]])

     if role[interface[:family]]
     if role[interface[:family]]

-      node.default[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
-      node.default[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
+      node.set[:networking][:interfaces][name][:method] = role[interface[:family]][:method]
+      node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
+      node.set[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]

     end
 
     end
 

-    node.default[:networking][:interfaces][name][:metric] = role[:metric]
-    node.default[:networking][:interfaces][name][:zone] = role[:zone]
+    node.set[:networking][:interfaces][name][:metric] = role[:metric]
+    node.set[:networking][:interfaces][name][:zone] = role[:zone]

   end
 
   end
 

+  node.set_unless[:networking][:interfaces][name][:method] = "static"
+
+  next unless interface[:address]
+

   prefix = node[:networking][:interfaces][name][:prefix]
 
   prefix = node[:networking][:interfaces][name][:prefix]
 

-  node.default[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
-  node.default[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
+  node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
+  node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)

 end
 
 template "/etc/network/interfaces" do
 end
 
 template "/etc/network/interfaces" do


@@ -86,7 +91,7 @@ node.interfaces(:role => :internal) do |interface|
       next unless gateway[:openvpn]
 
       gateway[:openvpn][:tunnels].each_value do |tunnel|
       next unless gateway[:openvpn]
 
       gateway[:openvpn][:tunnels].each_value do |tunnel|

-        if tunnel[:peer][:address]
+        if tunnel[:peer][:address] # ~FC023

           route tunnel[:peer][:address] do
             netmask "255.255.255.255"
             gateway interface[:gateway]
           route tunnel[:peer][:address] do
             netmask "255.255.255.255"
             gateway interface[:gateway]


@@ -116,8 +121,8 @@ search(:node, "networking:interfaces").collect do |n|
   n.interfaces.each do |interface|
     next unless interface[:role] == "external" && interface[:zone]
 
   n.interfaces.each do |interface|
     next unless interface[:role] == "external" && interface[:zone]
 

-    zones[interface[:zone]] ||= Hash.new
-    zones[interface[:zone]][interface[:family]] ||= Array.new
+    zones[interface[:zone]] ||= {}
+    zones[interface[:zone]][interface[:family]] ||= []

     zones[interface[:zone]][interface[:family]] << interface[:address]
   end
 end
     zones[interface[:zone]][interface[:family]] << interface[:address]
   end
 end


@@ -189,6 +194,14 @@ template "/etc/shorewall/rules" do
   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 

+template "/etc/logrotate.d/shorewall" do
+  source "logrotate.shorewall.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  variables :name => "shorewall"
+end
+

 firewall_rule "limit-icmp-echo" do
   action :accept
   family :inet
 firewall_rule "limit-icmp-echo" do
   action :accept
   family :inet


@@ -294,6 +307,14 @@ unless node.interfaces(:family => :inet6).empty?
     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 

+  template "/etc/logrotate.d/shorewall6" do
+    source "logrotate.shorewall.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables :name => "shorewall6"
+  end
+

   firewall_rule "limit-icmp6-echo" do
     action :accept
     family :inet6
   firewall_rule "limit-icmp6-echo" do
     action :accept
     family :inet6