Use new style loading for cldr extension

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

diff --git a/cookbooks/snmpd/recipes/default.rb b/cookbooks/snmpd/recipes/default.rb
index c6746678563c2cd01588d9b4065c21438fa483fa..b5bccce4be4fbdbb97df675acef1de42ed9e82b5 100644 (file)
--- a/cookbooks/snmpd/recipes/default.rb
+++ b/cookbooks/snmpd/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -24,7 +24,7 @@ communities = data_bag_item("snmpd", "communities")
 package "snmpd"
 
 service "snmpd" do
 package "snmpd"
 
 service "snmpd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 


@@ -32,16 +32,28 @@ template "/etc/snmp/snmpd.conf" do
   source "snmpd.conf.erb"
   owner "root"
   group "root"
   source "snmpd.conf.erb"
   owner "root"
   group "root"

-  mode 0600
+  mode 0o600

   variables :communities => communities
   variables :communities => communities

-  notifies :restart, resources(:service => "snmpd")
+  notifies :restart, "service[snmpd]"

 end
 
 end
 

-node[:snmpd][:clients].each do |address|
+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:"
+    end
+  end
+else

   firewall_rule "accept-snmp" do
     action :accept
     family "inet"
   firewall_rule "accept-snmp" do
     action :accept
     family "inet"

-    source "net:#{address}"
+    source "net"

     dest "fw"
     proto "udp"
     dest_ports "snmp"
     dest "fw"
     proto "udp"
     dest_ports "snmp"