Name php-fpm socket to work with apparmor-profiles

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

diff --git a/cookbooks/snmpd/recipes/default.rb b/cookbooks/snmpd/recipes/default.rb
index ccafc831cc98bd1a6f37aea7f608fd822514f134..26ae86b784ef4f9f6a1bd7f9ee4dc129603c7bc0 100644 (file)
--- a/cookbooks/snmpd/recipes/default.rb
+++ b/cookbooks/snmpd/recipes/default.rb
@@ -23,20 +23,20 @@ communities = data_bag_item("snmpd", "communities")
 
 package "snmpd"
 
-service "snmpd" do
-  action [:enable, :start]
-  supports :status => true, :restart => true
-end
-
 template "/etc/snmp/snmpd.conf" do
   source "snmpd.conf.erb"
   owner "root"
   group "root"
-  mode 0o600
+  mode "600"
   variables :communities => communities
   notifies :restart, "service[snmpd]"
 end
 
+service "snmpd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true
+end
+
 if node[:snmpd][:clients]
   node[:snmpd][:clients].each do |address|
     firewall_rule "accept-snmp" do
@@ -60,3 +60,27 @@ else
     source_ports "1024:"
   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:"
+    end
+  end
+else
+  firewall_rule "accept-snmp" do
+    action :accept
+    family "inet6"
+    source "net"
+    dest "fw"
+    proto "udp"
+    dest_ports "snmp"
+    source_ports "1024:"
+  end
+end