From: Matt Amos <zerebubuth@gmail.com>
Date: Mon, 20 Jun 2016 18:21:16 +0000 (+0100)
Subject: Reverse NFS recipe extraction.
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9eda23f8bac4f032b34df5edaf4c49b2be66870a?hp=2324d633f206c9360b4effe891a577aa57da74af

Reverse NFS recipe extraction.
---

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 28bcf7679..d5b30ba66 100644
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -17,6 +17,13 @@
 # limitations under the License.
 #
 
+node.set[:nfs]["/store/rails"] = {
+  :host => node[:web][:fileserver],
+  :path => "/store/rails"
+}
+
+include_recipe "nfs"
+
 directory node[:web][:base_directory] do
   group "rails"
   mode 0o2775
diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index 791c3fe2f..7806530d9 100644
--- a/cookbooks/web/recipes/gpx.rb
+++ b/cookbooks/web/recipes/gpx.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "web::base"
-include_recipe "web::nfs"
 
 db_passwords = data_bag_item("db", "passwords")
 
diff --git a/cookbooks/web/recipes/nfs.rb b/cookbooks/web/recipes/nfs.rb
deleted file mode 100644
index 1ca1312f9..000000000
--- a/cookbooks/web/recipes/nfs.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Cookbook Name:: web
-# Recipe:: nfs
-#
-# Copyright 2011, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-node.set[:nfs]["/store/rails"] = {
-  :host => node[:web][:fileserver],
-  :path => "/store/rails"
-}
-
-include_recipe "nfs"
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 848ac239d..52aa09625 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -19,7 +19,6 @@
 
 include_recipe "tools"
 include_recipe "web::base"
-include_recipe "web::nfs"
 
 include_recipe "apache"
 include_recipe "passenger"