Process the expiry queue in order

[chef.git] / cookbooks / nfs / recipes / default.rb

diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index f94bb97f12a776aeb0f5f94449c4b78f3dba61b5..c42cf9c82eb9b398254a5c0fb33e61e4fe98568d 100644 (file)
--- a/cookbooks/nfs/recipes/default.rb
+++ b/cookbooks/nfs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: nfs
+# Cookbook:: nfs
 # Recipe:: default
 #
-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, 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
+#     https://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,
@@ -21,9 +21,9 @@ package "nfs-common"
 
 node[:nfs].each do |mountpoint, details|
   mount_options = if details[:readonly]
-                    "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3"
+                    "ro,bg,soft,tcp,rsize=8192,wsize=8192,nfsvers=4"
                   else
-                    "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3"
+                    "rw,bg,tcp,rsize=8192,wsize=8192,nfsvers=4"
                   end
 
   directory mountpoint do
@@ -31,7 +31,7 @@ node[:nfs].each do |mountpoint, details|
     group "root"
     mode 0o755
     recursive true
-    not_if { File.exist?(mountpoint) }
+    not_if { ::File.exist?(mountpoint) }
   end
 
   mount mountpoint do