Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 620194df8973c596608c69d662cbfa697d6d292c..babff56df277c1532a6249251a4fad18b68d59aa 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: logstash
+# Cookbook:: logstash
 # Recipe:: default
 #
-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ include_recipe "networking"
 keys = data_bag_item("logstash", "keys")
 
 package %w[
-  default-jre-headless
+  openjdk-8-jre-headless
   logstash
 ]
 
@@ -54,6 +54,14 @@ file "/etc/logrotate.d/logstash" do
   mode 0o644
 end
 
+template "/etc/default/logstash" do
+  source "logstash.default.erb"
+  user "root"
+  group "root"
+  mode 0o644
+  notifies :restart, "service[logstash]"
+end
+
 service "logstash" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
@@ -66,7 +74,7 @@ template "/etc/cron.daily/expire-logstash" do
   mode 0o755
 end
 
-forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010
+forwarders = search(:node, "recipes:logstash\\:\\:forwarder")
 
 forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|
@@ -92,7 +100,7 @@ forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   end
 end
 
-gateways = search(:node, "roles:gateway") # ~FC010
+gateways = search(:node, "roles:gateway")
 
 gateways.sort_by { |n| n[:fqdn] }.each do |gateway|
   gateway.interfaces(:role => :external) do |interface|