Update carto stylesheet to v2.32.0

[chef.git] / cookbooks / web / recipes / rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 52a49aee8731414a83c6fcb9b01655279b44a49a..4c8d3fb558683fd9820672b4620195dff11f8ddc 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -60,11 +60,19 @@ rails_port "www.openstreetmap.org" do
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"

+  logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"

   memcache_servers %w(rails1 rails2 rails3)
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   piwik_configuration piwik_configuration
   memcache_servers %w(rails1 rails2 rails3)
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   piwik_configuration piwik_configuration

+  google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
+  google_auth_secret web_passwords["google_auth_secret"]
+  google_openid_realm "https://www.openstreetmap.org"
+  facebook_auth_id "427915424036881"
+  facebook_auth_secret web_passwords["facebook_auth_secret"]
+  windowslive_auth_id "0000000040153C51"
+  windowslive_auth_secret web_passwords["windowslive_auth_secret"]

 end
 
 gem_package "apachelogregex"
 end
 
 gem_package "apachelogregex"


@@ -90,3 +98,14 @@ service "api-statistics" do
   subscribes :restart, "template[/usr/local/bin/api-statistics]"
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end
   subscribes :restart, "template[/usr/local/bin/api-statistics]"
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end

+
+munin_plugin "api_calls_status"
+munin_plugin "api_calls_num"
+
+munin_plugin "api_calls_#{node[:hostname]}" do
+  target "api_calls_"
+end
+
+munin_plugin "api_waits_#{node[:hostname]}" do
+  target "api_waits_"
+end