Drop NFS mounts from web servers

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index 89feed9a8996a4063cdb1129cab5593b761f39a2..714eb71c1c98c05314a50d2f06be0b4a5ab08c04 100644 (file)
--- 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 2c943c6246f8e949c27d1465cb4039188ee2276a..6fe8c7f5d6b939441de070efc4649db9048d7e04 100644 (file)
--- 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 457cd69cee250692a8fd8d6eb3e5f5bb7b08aa24..8b83a9477d2a05776b169fd39342af5ec6249a7b 100644 (file)
--- 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 528b78fea49a6b70a9228defc862e0feae72053a..9293e3570b7db47ec1d6313b0ab7fdf94f40100a 100644 (file)
--- 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>