nominatim: ruby packages needed for prometheus

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

diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index 720b113216d342abe8f6ccec947cd0aa5f15eb28..665b6730b05e54b94ae94d00f7c061103ea5f0dc 100644 (file)
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -19,7 +19,6 @@
 
 include_recipe "accounts"
 include_recipe "apache"
 
 include_recipe "accounts"
 include_recipe "apache"

-include_recipe "munin"

 include_recipe "prometheus"
 include_recipe "ruby"
 
 include_recipe "prometheus"
 include_recipe "ruby"
 


@@ -27,7 +26,7 @@ username = "overpass"
 basedir = data_bag_item("accounts", username)["home"]
 web_passwords = data_bag_item("web", "passwords")
 
 basedir = data_bag_item("accounts", username)["home"]
 web_passwords = data_bag_item("web", "passwords")
 

-%w[bin site diffs db src munin].each do |dirname|
+%w[bin site diffs db src].each do |dirname|

   directory "#{basedir}/#{dirname}" do
     owner username
     group username
   directory "#{basedir}/#{dirname}" do
     owner username
     group username


@@ -50,7 +49,7 @@ package %w[
 ]
 
 remote_file "#{srcdir}.tar.gz" do
 ]
 
 remote_file "#{srcdir}.tar.gz" do

-  action :create
+  action :create_if_missing

   source "https://dev.overpass-api.de/releases/osm-3s_v#{node[:overpass][:version]}.tar.gz"
   owner username
   group username
   source "https://dev.overpass-api.de/releases/osm-3s_v#{node[:overpass][:version]}.tar.gz"
   owner username
   group username


@@ -229,24 +228,6 @@ template "/etc/logrotate.d/overpass" do
   variables :logdir => logdir
 end
 
   variables :logdir => logdir
 end
 

-# Munin scripts
-
-%w[db_lag request_count].each do |name|
-  template "#{basedir}/munin/overpass_#{name}" do
-    source "munin_#{name}.erb"
-    owner username
-    group username
-    mode "755"
-    variables :basedir => basedir
-  end
-
-  munin_plugin "overpass_#{name}" do
-    target "#{basedir}/munin/overpass_#{name}"
-    conf "munin.erb"
-    conf_variables :user => username
-  end
-end
-

 prometheus_exporter "overpass" do
   port 9898
   user username
 prometheus_exporter "overpass" do
   port 9898
   user username