Revert "Take thorn-03 out of production"

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 50fa35cfb6bcafcfbdff420c939cabb7dfe257f4..fe01c04e5634919c7d15c04c41b524805e535d20 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -25,18 +25,18 @@ require "ipaddr"
 node[:networking][:interfaces].each do |name, interface|
   if interface[:role] && role = node[:networking][:roles][interface[:role]]
     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][:prefix] = role[interface[:family]][:prefix]
+      node.set[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
     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
 
   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
@@ -86,7 +86,7 @@ node.interfaces(:role => :internal) do |interface|
       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]
@@ -189,6 +189,14 @@ template "/etc/shorewall/rules" do
   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
@@ -294,6 +302,14 @@ unless node.interfaces(:family => :inet6).empty?
     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