Configure eddie as a database master

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

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 55675fa71ee78042aef6b81d8c2757eda4cd798b..3f2c98f91165cf1db973af63e27794d37cf2f5ad 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -21,14 +21,14 @@ include_recipe "networking"
 
 keys = data_bag_item("logstash", "keys")
 
 
 keys = data_bag_item("logstash", "keys")
 

-package "openjdk-7-jre-headless"
+package "default-jre-headless"

 package "logstash"
 
 cookbook_file "/var/lib/logstash/lumberjack.crt" do
   source "lumberjack.crt"
   user "root"
   group "logstash"
 package "logstash"
 
 cookbook_file "/var/lib/logstash/lumberjack.crt" do
   source "lumberjack.crt"
   user "root"
   group "logstash"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[logstash]"
 end
 
   notifies :restart, "service[logstash]"
 end
 


@@ -36,7 +36,7 @@ file "/var/lib/logstash/lumberjack.key" do
   content keys["lumberjack"].join("\n")
   user "root"
   group "logstash"
   content keys["lumberjack"].join("\n")
   user "root"
   group "logstash"

-  mode 0640
+  mode 0o640

   notifies :restart, "service[logstash]"
 end
 
   notifies :restart, "service[logstash]"
 end
 


@@ -44,25 +44,29 @@ template "/etc/logstash/conf.d/chef.conf" do
   source "logstash.conf.erb"
   user "root"
   group "root"
   source "logstash.conf.erb"
   user "root"
   group "root"

-  mode 0644
-  notifies :restart, "service[logstash]"
+  mode 0o644
+  notifies :reload, "service[logstash]"
+end
+
+file "/etc/logrotate.d/logstash" do
+  mode 0o644

 end
 
 service "logstash" do
   action [:enable, :start]
 end
 
 service "logstash" do
   action [:enable, :start]

-  supports :status => true, :restart => true
+  supports :status => true, :restart => true, :reload => true

 end
 
 template "/etc/cron.daily/expire-logstash" do
   source "expire.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/expire-logstash" do
   source "expire.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 end
 

-forwarders = search(:node, "recipes:logstash\\:\\:forwarder")
+forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010

 
 

-forwarders.each do |forwarder|
+forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|

   forwarder.interfaces(:role => :external) do |interface|
     firewall_rule "accept-lumberjack-#{forwarder}" do
       action :accept
   forwarder.interfaces(:role => :external) do |interface|
     firewall_rule "accept-lumberjack-#{forwarder}" do
       action :accept


@@ -75,3 +79,19 @@ forwarders.each do |forwarder|
     end
   end
 end
     end
   end
 end

+
+gateways = search(:node, "roles:gateway") # ~FC010
+
+gateways.sort_by { |n| n[:fqdn] }.each do |gateway|
+  gateway.interfaces(:role => :external) do |interface|
+    firewall_rule "accept-lumberjack-#{gateway}" do
+      action :accept
+      family interface[:family]
+      source "#{interface[:zone]}:#{interface[:address]}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports "5043"
+      source_ports "1024:"
+    end
+  end
+end