Merge remote-tracking branch 'github/pull/451'

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

diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index ff37b7b61643a75bfc31483f7dc854e908fbb872..216e825f2b48b6776587705d8f891267d4b41843 100644 (file)
--- a/cookbooks/nfs/recipes/default.rb
+++ b/cookbooks/nfs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# 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.
@@ -21,17 +21,17 @@ 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
     owner "root"
     group "root"
-    mode 0o755
+    mode "755"
     recursive true
-    not_if { File.exist?(mountpoint) }
+    not_if { ::File.exist?(mountpoint) }
   end
 
   mount mountpoint do