X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/abd5ecd0198dd98d37c8cc13e457ce996b5b3d88..9609940accb4bc20bc380f2b35e850c0f5d0f66d:/cookbooks/logstash/recipes/default.rb

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index b5d039705..73198d593 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
@@ -48,6 +48,10 @@ template "/etc/logstash/conf.d/chef.conf" do
   notifies :restart, "service[logstash]"
 end
 
+file "/etc/logrotate.d/logstash" do
+  mode 0644
+end
+
 service "logstash" do
   action [:enable, :start]
   supports :status => true, :restart => true
@@ -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