X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5c14a187ae78003d1b29a6fe8d3235637e2a1420..dc978c5b27a3d73ec954182275ac106068b2ae50:/cookbooks/web/recipes/rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 43fba5fb4..b28e19ba7 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -146,8 +146,8 @@ rails_port "www.openstreetmap.org" do
   trace_icon_storage "gps_images"
   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
+  overpass_url "https://query.openstreetmap.org/query-features"
+  overpass_credentials true
 end
 
 systemd_service "rails-jobs@" do
@@ -159,11 +159,9 @@ systemd_service "rails-jobs@" do
   exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"
   restart "on-failure"
   nice 10
-  private_tmp true
-  private_devices true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  sandbox :enable_network => true
+  memory_deny_write_execute false
+  read_write_paths "/var/log/web"
 end
 
 package "libjson-xs-perl"
@@ -196,12 +194,11 @@ systemd_service "api-statistics" do
   group "adm"
   exec_start "/usr/local/bin/api-statistics"
   nice 10
-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  sandbox true
+  read_write_paths [
+    "/srv/www.openstreetmap.org/rails/tmp",
+    "/var/lib/prometheus/node-exporter"
+  ]
   restart "on-failure"
 end