X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19df19419a5a308999ed7adb67627328a41624ea..f87f325f578da8a21eaaf6a73e69db00f4347161:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 72268aace..d46c09ee1 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. @@ -52,6 +52,21 @@ 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 ruby_version directory rails_directory @@ -93,6 +108,9 @@ rails_port "www.openstreetmap.org" do 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