X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..fa2ffc4b6ec0b9572dac9470bcfb474894b8a722:/cookbooks/web/recipes/rails.rb?ds=inline diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index d5f34cbf7..7bd00e0b9 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: web +# Cookbook:: web # Recipe:: rails # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,13 +17,15 @@ # limitations under the License. # -include_recipe "tools" -include_recipe "web::base" - include_recipe "apache" -include_recipe "passenger" +include_recipe "apt" include_recipe "git" +include_recipe "geoipupdate" +include_recipe "munin" include_recipe "nodejs" +include_recipe "passenger" +include_recipe "tools" +include_recipe "web::base" web_passwords = data_bag_item("web", "passwords") db_passwords = data_bag_item("db", "passwords") @@ -44,19 +46,35 @@ template "/etc/cron.hourly/passenger" do source "passenger.cron.erb" owner "root" group "root" - mode 0o755 + mode "755" end +ruby_version = node[:passenger][:ruby_version] rails_directory = "#{node[:web][:base_directory]}/rails" piwik = data_bag_item("web", "piwik") +storage = { + "avatars" => { + "service" => "S3", + "access_key_id" => "AKIASQUXHPE7AMJQRFOS", + "secret_access_key" => web_passwords["aws_key"], + "region" => "eu-west-1", + "bucket" => "openstreetmap-user-avatars", + "use_dualstack_endpoint" => true, + "upload" => { + "acl" => "public-read", + "cache_control" => "public, max-age=31536000, immutable" + } + } +} + rails_port "www.openstreetmap.org" do - ruby node[:passenger][:ruby_version] + ruby ruby_version directory rails_directory user "rails" group "rails" - repository "git://git.openstreetmap.org/rails.git" + repository "https://git.openstreetmap.org/public/rails.git" revision "live" database_host node[:web][:database_host] database_name "openstreetmap" @@ -73,6 +91,7 @@ rails_port "www.openstreetmap.org" do potlatch2_key web_passwords["potlatch2_key"] id_key web_passwords["id_key"] oauth_key web_passwords["oauth_key"] + oauth_application web_passwords["oauth_application"] piwik_configuration "location" => piwik[:location], "site" => piwik[:site], "goals" => piwik[:goals].to_hash @@ -87,10 +106,42 @@ rails_port "www.openstreetmap.org" do github_auth_secret web_passwords["github_auth_secret"] wikipedia_auth_id "e4fe0c2c5855d23ed7e1f1c0fa1f1c58" wikipedia_auth_secret web_passwords["wikipedia_auth_secret"] - mapzen_valhalla_key web_passwords["mapzen_valhalla_key"] thunderforest_key web_passwords["thunderforest_key"] totp_key web_passwords["totp_key"] - csp_report_url "https://openstreetmap.report-uri.io/r/default/csp/reportOnly" + csp_enforce true + trace_use_job_queue true + diary_feed_delay 12 + storage_configuration storage + storage_service "avatars" + storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com" + overpass_url "https://query.openstreetmap.org/query-features" +end + +gem_package "bundler#{ruby_version}" do + package_name "bundler" + gem_binary "gem#{ruby_version}" + options "--format-executable" +end + +bundle = if File.exist?("/usr/bin/bundle#{ruby_version}") + "/usr/bin/bundle#{ruby_version}" + else + "/usr/local/bin/bundle#{ruby_version}" + end + +systemd_service "rails-jobs@" do + description "Rails job queue runner" + type "simple" + environment "RAILS_ENV" => "production", "QUEUE" => "%I" + user "rails" + working_directory rails_directory + exec_start "#{bundle} exec rake jobs:work" + restart "on-failure" + private_tmp true + private_devices true + protect_system "full" + protect_home true + no_new_privileges true end package "libjson-xs-perl" @@ -99,7 +150,7 @@ template "/usr/local/bin/cleanup-rails-assets" do source "cleanup-assets.erb" owner "root" group "root" - mode 0o755 + mode "755" end gem_package "apachelogregex" @@ -109,7 +160,7 @@ template "/usr/local/bin/api-statistics" do source "api-statistics.erb" owner "root" group "root" - mode 0o755 + mode "755" end systemd_service "api-statistics" do