imagery: set mapserver memory limit

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

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 34f731af29734698f9c9dddc0a157a32ba54bb8b..46bc3fea03d304b32861a7baea2f7a8217d7e044 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -23,8 +23,9 @@ include_recipe "networking"
 keys = data_bag_item("logstash", "keys")
 
 package %w[
-  openjdk-8-jre-headless
+  openjdk-11-jre-headless
   logstash
+  logrotate
 ]
 
 cookbook_file "/var/lib/logstash/beats.crt" do
@@ -77,15 +78,11 @@ end
 forwarders = []
 
 search(:node, "recipes:logstash\\:\\:forwarder").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
+  forwarders.append(forwarder.ipaddresses(:role => :external))
 end
 
 search(:node, "roles:gateway").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
+  forwarders.append(forwarder.ipaddresses(:role => :external))
 end
 
 firewall_rule "accept-logstash" do