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 c97882d963ea4dffa72351d3fa97dd8c6f145ee7..babff56df277c1532a6249251a4fad18b68d59aa 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -74,7 +74,7 @@ template "/etc/cron.daily/expire-logstash" do
   mode 0o755
 end
 
   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|
 
 forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|


@@ -100,7 +100,7 @@ forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   end
 end
 
   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|
 
 gateways.sort_by { |n| n[:fqdn] }.each do |gateway|
   gateway.interfaces(:role => :external) do |interface|