Switch the web site to use poldi for nominatim

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index cd8bb9b568bda3d08530626a50cdcdc6e75bf798..e131d0b0cf2fb6211b4c07915d63433a952fff39 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -21,36 +21,12 @@ include_recipe "tools"
 include_recipe "web::base"
 
 include_recipe "apache"
 include_recipe "web::base"
 
 include_recipe "apache"

+include_recipe "passenger"

 include_recipe "git"
 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
 include_recipe "git"
 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 

-directory "#{node[:web][:base_directory]}/bin" do
-  owner "root"
-  group "root"
-  mode 0755
-end
-
-template "#{node[:web][:base_directory]}/bin/ruby" do
-  source "ruby.erb"
-  owner "root"
-  group "root"
-  mode 0755
-  notifies :reload, "service[apache2]"
-end
-
-apache_module "passenger" do
-  conf "passenger.conf.erb"
-end
-
-package "passenger-common#{node[:web][:ruby_version]}"
-
-munin_plugin "passenger_memory"
-munin_plugin "passenger_processes"
-munin_plugin "passenger_queues"
-munin_plugin "passenger_requests"
-

 template "/etc/cron.hourly/passenger" do
   cookbook "web"
   source "passenger.cron.erb"
 template "/etc/cron.hourly/passenger" do
   cookbook "web"
   source "passenger.cron.erb"


@@ -61,8 +37,12 @@ end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 

+piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _|
+  %w(chef_type data_bag id).include?(k)
+end
+

 rails_port "www.openstreetmap.org" do
 rails_port "www.openstreetmap.org" do

-  ruby node[:web][:ruby_version]
+  ruby node[:passenger][:ruby_version]

   directory rails_directory
   user "rails"
   group "rails"
   directory rails_directory
   user "rails"
   group "rails"


@@ -77,16 +57,51 @@ rails_port "www.openstreetmap.org" do
   messages_domain "messages.openstreetmap.org"
   quova_username "ws360602"
   quova_password web_passwords["quova"]
   messages_domain "messages.openstreetmap.org"
   quova_username "ws360602"
   quova_password web_passwords["quova"]

-  soft_memory_limit node[:web][:rails_soft_memory_limit]
-  hard_memory_limit node[:web][:rails_hard_memory_limit]

   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"

-  memcache_servers [ "rails1", "rails2", "rails3" ]
+  memcache_servers %w(rails1 rails2 rails3)

   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]

-  piwik_location "piwik.openstreetmap.org"
-  piwik_site 1
-  piwik_signup_goal 1
+  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"
+  nominatim_url "//poldi.openstreetmap.org/"
+end
+
+gem_package "apachelogregex"
+gem_package "file-tail"
+
+template "/usr/local/bin/api-statistics" do
+  source "api-statistics.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/init.d/api-statistics" do
+  source "api-statistics.init.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+service "api-statistics" do
+  action [:enable, :start]
+  supports :restart => true
+  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
 end