Reverse NFS recipe extraction.

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 28bcf76790850e2e8eaa46b08a7b5ed8d483e75c..d5b30ba66e856985e8e741a0c684dca24829e96a 100644 (file)
--- 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 791c3fe2fc56f4396051e08c0fd24a46b428114b..7806530d97f9c216ce2327e71593ce5c1195e2aa 100644 (file)
--- 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 (file)
index 1ca1312..0000000
--- 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 848ac239d334601f553fa2e3ba27134ef5ca7aa9..52aa09625c447bcd3377025ea4f3e742d84f3e2b 100644 (file)
--- 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"