Send credentials with overpass requests

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 50758caeac2cff7ecb88bc720cbcab8d899a96dc..4b59eb00b5839090af746dee1650267220ad8cb8 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -52,7 +52,7 @@ end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 

-piwik = data_bag_item("web", "piwik")
+matomo = data_bag_item("web", "matomo")

 
 storage = {
   "avatars" => {
 
 storage = {
   "avatars" => {


@@ -120,9 +120,9 @@ rails_port "www.openstreetmap.org" do
   id_application web_passwords["id_application"]
   oauth_key web_passwords["oauth_key"]
   oauth_application web_passwords["oauth_application"]
   id_application web_passwords["id_application"]
   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
+  matomo_configuration "location" => matomo[:location],
+                       "site" => matomo[:site],
+                       "goals" => matomo[:goals].to_hash

   google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
   google_auth_secret web_passwords["google_auth_secret"]
   google_openid_realm "https://www.openstreetmap.org"
   google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
   google_auth_secret web_passwords["google_auth_secret"]
   google_openid_realm "https://www.openstreetmap.org"


@@ -147,16 +147,18 @@ rails_port "www.openstreetmap.org" do
   avatar_storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
   trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
   overpass_url "https://query.openstreetmap.org/query-features"
   avatar_storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
   trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
   overpass_url "https://query.openstreetmap.org/query-features"

+  overpass_credentials true

 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 "RAILS_ENV" => "production", "QUEUE" => "%I"
+  environment "RAILS_ENV" => "production", "QUEUE" => "%I", "SLEEP_DELAY" => "60"

   user "rails"
   working_directory rails_directory
   user "rails"
   working_directory rails_directory

-  exec_start "#{node[:ruby][:bundle]} exec rake jobs:work"
+  exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"

   restart "on-failure"
   restart "on-failure"

+  nice 10

   private_tmp true
   private_devices true
   protect_system "full"
   private_tmp true
   private_devices true
   protect_system "full"


@@ -193,6 +195,7 @@ systemd_service "api-statistics" do
   user "rails"
   group "adm"
   exec_start "/usr/local/bin/api-statistics"
   user "rails"
   group "adm"
   exec_start "/usr/local/bin/api-statistics"

+  nice 10

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true