X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/67dd81a83b573132e0423134ab5dfbbde7da71e3..a8ceb7d054b73f53c90718aca976e1898d97d809:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index ea9a58c4e..a6af8715f 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. @@ -22,6 +22,7 @@ include_recipe "web::base" include_recipe "apache" include_recipe "passenger" +include_recipe "geoipupdate" include_recipe "git" include_recipe "nodejs" @@ -47,12 +48,28 @@ template "/etc/cron.hourly/passenger" do mode 0o755 end +ruby_version = node[:passenger][:ruby_version] rails_directory = "#{node[:web][:base_directory]}/rails" piwik = data_bag_item("web", "piwik") +storage = { + "aws" => { + "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" @@ -87,10 +104,29 @@ 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_enforce true + trace_use_job_queue true + diary_feed_delay 12 + storage_configuration storage + storage_service "aws" + storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com" +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 "/usr/local/bin/bundle#{ruby_version} 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"