X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1f0523d2dcc5b205c34ef641715065106a1b13a6..fedddc7182f1f441b607ab8eb7644ac60924f129:/cookbooks/munin/recipes/server.rb?ds=inline diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index bd1576680..b3f64c458 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -49,9 +49,6 @@ clients = search(:node, "recipes:munin\\:\\:default").sort_by(&:name) frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n| { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") } end -backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n| - { :name => n.name.split(".").first } -end tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n| { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") } end @@ -68,9 +65,8 @@ template "/etc/munin/munin.conf" do group "root" mode "644" variables :expiry_time => expiry_time, :clients => clients, - :frontends => frontends, :backends => backends, - :tilecaches => tilecaches, :renderers => renderers, - :geocoders => geocoders + :frontends => frontends, :geocoders => geocoders, + :tilecaches => tilecaches, :renderers => renderers end apache_module "fcgid"