X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/549833694d2c35ba99ac30edbecc4e96ecabb392..4f581378f4dfdd9cb5a357b6324985d1d53f9663:/cookbooks/web/recipes/rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 9f51581b4..8b83a9477 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -107,8 +107,6 @@ rails_port "www.openstreetmap.org" do
   email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
   status node[:web][:status]
   messages_domain "messages.openstreetmap.org"
-  gpx_dir "/store/rails/gpx"
-  attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
   logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"
   memcache_servers node[:web][:memcached_servers]
@@ -136,17 +134,12 @@ rails_port "www.openstreetmap.org" do
   trace_use_job_queue true
   diary_feed_delay 12
   storage_configuration storage
-  storage_service "avatars"
-  storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
   avatar_storage "avatars"
   trace_file_storage "gps_traces"
   trace_image_storage "gps_images"
   trace_icon_storage "gps_images"
-  storage_urls %w[
-    https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com
-    https://openstreetmap-gps-traces.s3.dualstack.eu-west-1.amazonaws.com
-    https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com
-  ]
+  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"
 end