From 398274734787c764e4ff5890231162dfdac9d339 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 6 Mar 2022 11:56:27 +0000
Subject: [PATCH] Drop NFS mounts from web servers

---
 cookbooks/web/metadata.rb                          |  1 -
 cookbooks/web/recipes/base.rb                      |  6 ------
 cookbooks/web/recipes/rails.rb                     |  2 --
 .../web/templates/default/apache.frontend.erb      | 14 --------------
 4 files changed, 23 deletions(-)

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index 89feed9a8..714eb71c1 100644
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -14,7 +14,6 @@ depends           "geoipupdate"
 depends           "git"
 depends           "memcached"
 depends           "munin"
-depends           "nfs"
 depends           "nodejs"
 depends           "passenger"
 depends           "systemd"
diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 2c943c624..6fe8c7f5d 100644
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -17,13 +17,7 @@
 # limitations under the License.
 #
 
-node.default[:nfs]["/store/rails"] = {
-  :host => node[:web][:fileserver],
-  :path => "/store/rails"
-}
-
 include_recipe "accounts"
-include_recipe "nfs"
 
 directory node[:web][:base_directory] do
   group "rails"
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 457cd69ce..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]
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 528b78fea..9293e3570 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -140,8 +140,6 @@
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/static/openlayers
   RedirectPermanent /stats https://planet.openstreetmap.org/statistics
-  Alias /user/image /store/rails/user/image
-  Alias /attachments /store/rails/attachments
 
   #
   # Pass authentication related headers to cgimap
@@ -301,15 +299,3 @@
 <Directory /srv/www.openstreetmap.org/rails/vendor/assets>
   Require all granted
 </Directory>
-
-<Directory /store/rails/stats>
-  Require all granted
-</Directory>
-
-<Directory /store/rails/user/image>
-  Require all granted
-</Directory>
-
-<Directory /store/rails/attachments>
-  Require all granted
-</Directory>
-- 
2.39.5