X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/74e00583c114a2c0eb007cbec4cc90dad5453cdd..96170ed36bbce5a18d67fed0beeb23594809ac62:/cookbooks/logstash/recipes/default.rb

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 55675fa71..86711fb31 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "networking"
 
 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
@@ -45,12 +45,16 @@ template "/etc/logstash/conf.d/chef.conf" do
   user "root"
   group "root"
   mode 0644
-  notifies :restart, "service[logstash]"
+  notifies :reload, "service[logstash]"
+end
+
+file "/etc/logrotate.d/logstash" do
+  mode 0644
 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
@@ -60,7 +64,7 @@ template "/etc/cron.daily/expire-logstash" do
   mode 0755
 end
 
-forwarders = search(:node, "recipes:logstash\\:\\:forwarder")
+forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010
 
 forwarders.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|
@@ -75,3 +79,19 @@ forwarders.each do |forwarder|
     end
   end
 end
+
+gateways = search(:node, "roles:gateway") # ~FC010
+
+gateways.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