X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..b8384facfdc8d21e51aee534fff52196aea8b6fa:/cookbooks/web/recipes/rails.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index cd8bb9b56..a388b2159 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -21,48 +21,31 @@ include_recipe "tools" include_recipe "web::base" include_recipe "apache" +include_recipe "passenger" include_recipe "git" +include_recipe "nodejs" 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" +nodejs_package "svgo" template "/etc/cron.hourly/passenger" do cookbook "web" source "passenger.cron.erb" owner "root" group "root" - mode 0755 + mode 0o755 end 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 - ruby node[:web][:ruby_version] + ruby node[:passenger][:ruby_version] directory rails_directory user "rails" group "rails" @@ -77,16 +60,69 @@ rails_port "www.openstreetmap.org" do 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" - memcache_servers [ "rails1", "rails2", "rails3" ] + logstash_path "#{node[:web][:log_directory]}/rails-logstash.log" + memcache_servers node[:web][:memcached_servers] 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" + facebook_auth_id "427915424036881" + facebook_auth_secret web_passwords["facebook_auth_secret"] + windowslive_auth_id "0000000040153C51" + windowslive_auth_secret web_passwords["windowslive_auth_secret"] + github_auth_id "acf7da34edee99e35499" + github_auth_secret web_passwords["github_auth_secret"] + mapzen_valhalla_key web_passwords["mapzen_valhalla_key"] +end + +package "libjson-xs-perl" + +template "/usr/local/bin/cleanup-rails-assets" do + source "cleanup-assets.erb" + owner "root" + group "root" + mode 0o755 +end + +gem_package "apachelogregex" +gem_package "file-tail" + +template "/usr/local/bin/api-statistics" do + source "api-statistics.erb" + owner "root" + group "root" + mode 0o755 +end + +template "/etc/init.d/api-statistics" do + source "api-statistics.init.erb" + owner "root" + group "root" + mode 0o755 +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 + +gem_package "hpricot" + +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