Update formatting of header comments

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index ab674ba93e03e525539f6bf457bf5236baa76b6e..d46c09ee126c9a78d167d0a5ee031292fea2c568 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: rails
 #
 # 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.
 #
 # 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")
 
 
 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
 rails_port "www.openstreetmap.org" do
   ruby ruby_version
   directory rails_directory


@@ -91,12 +106,17 @@ rails_port "www.openstreetmap.org" do
   thunderforest_key web_passwords["thunderforest_key"]
   totp_key web_passwords["totp_key"]
   csp_enforce true
   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"
 end
 
 systemd_service "rails-jobs@" do
   description "Rails job queue runner"
   type "simple"

-  environment "QUEUE" => "%I"
+  environment "RAILS_ENV" => "production", "QUEUE" => "%I"

   user "rails"
   working_directory rails_directory
   exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"
   user "rails"
   working_directory rails_directory
   exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"