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

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

diff --git a/cookbooks/snmpd/recipes/default.rb b/cookbooks/snmpd/recipes/default.rb
index 6fc4a36aac8e7e401022c7c2b5a544c919afaa2c..f4a57fef2851d72d81ae9b8e456f3a5203378e6c 100644 (file)
--- a/cookbooks/snmpd/recipes/default.rb
+++ b/cookbooks/snmpd/recipes/default.rb
@@ -37,50 +37,11 @@ service "snmpd" do
   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 

-if node[:snmpd][:clients]
-  node[:snmpd][:clients].each do |address|
-    firewall_rule "accept-snmp" do
-      action :accept
-      family "inet"
-      source "net:#{address}"
-      dest "fw"
-      proto "udp"
-      dest_ports "snmp"
-      source_ports "1024-65535"
-    end
-  end
-else
-  firewall_rule "accept-snmp" do
-    action :accept
-    family "inet"
-    source "net"
-    dest "fw"
-    proto "udp"
-    dest_ports "snmp"
-    source_ports "1024-65535"
-  end
-end
-
-if node[:snmpd][:clients6]
-  node[:snmpd][:clients6].each do |address|
-    firewall_rule "accept-snmp" do
-      action :accept
-      family "inet6"
-      source "net:#{address}"
-      dest "fw"
-      proto "udp"
-      dest_ports "snmp"
-      source_ports "1024-65535"
-    end
-  end
-else
-  firewall_rule "accept-snmp" do
-    action :accept
-    family "inet6"
-    source "net"
-    dest "fw"
-    proto "udp"
-    dest_ports "snmp"
-    source_ports "1024-65535"
-  end
+firewall_rule "accept-snmp" do
+  action :accept
+  context :incoming
+  protocol :udp
+  source node[:snmpd][:clients] if node[:snmpd][:clients]
+  dest_ports "snmp"
+  source_ports "1024-65535"

 end
 end