X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0f71f1838a40b5ead039441f7cd159100034503e..c871e3f1f583dc2ac5cfb5dd9c39f069831c09c4:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 2542edea3..7f025493b 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -35,7 +35,7 @@ template "/etc/cron.hourly/passenger" do source "passenger.cron.erb" owner "root" group "root" - mode 0755 + mode 0o755 end rails_directory = "#{node[:web][:base_directory]}/rails" @@ -64,7 +64,7 @@ rails_port "www.openstreetmap.org" do attachments_dir "/store/rails/attachments" log_path "#{node[:web][:log_directory]}/rails.log" logstash_path "#{node[:web][:log_directory]}/rails-logstash.log" - memcache_servers node[:web][:backends] + memcache_servers node[:web][:memcached_servers] potlatch2_key web_passwords["potlatch2_key"] id_key web_passwords["id_key"] oauth_key web_passwords["oauth_key"] @@ -85,7 +85,7 @@ template "/usr/local/bin/cleanup-rails-assets" do source "cleanup-assets.erb" owner "root" group "root" - mode 0755 + mode 0o755 end gem_package "apachelogregex" @@ -95,14 +95,14 @@ template "/usr/local/bin/api-statistics" do source "api-statistics.erb" owner "root" group "root" - mode 0755 + mode 0o755 end template "/etc/init.d/api-statistics" do source "api-statistics.init.erb" owner "root" group "root" - mode 0755 + mode 0o755 end service "api-statistics" do @@ -112,6 +112,8 @@ service "api-statistics" do subscribes :restart, "template[/etc/init.d/api-statistics]" end +gem_package "hpricot" + munin_plugin "api_calls_status" munin_plugin "api_calls_num"