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 1719a967cb94cefcf9dd8a6e675c16b3f26f5a87..216e825f2b48b6776587705d8f891267d4b41843 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
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,23 +19,23 @@
 
 package "nfs-common"
 
 
 package "nfs-common"
 

-node[:nfs].each do |mountpoint,details|
-  if details[:readonly]
-    mount_options = "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3"
-  else
-    mount_options = "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3"
-  end
+node[:nfs].each do |mountpoint, details|
+  mount_options = if details[:readonly]
+                    "ro,bg,soft,tcp,rsize=8192,wsize=8192,nfsvers=4"
+                  else
+                    "rw,bg,tcp,rsize=8192,wsize=8192,nfsvers=4"
+                  end

 
   directory mountpoint do
     owner "root"
     group "root"
 
   directory mountpoint do
     owner "root"
     group "root"

-    mode 0755
+    mode "755"

     recursive true
     recursive true

-    not_if { File.exist?(mountpoint) }
+    not_if { ::File.exist?(mountpoint) }

   end
 
   mount mountpoint do
   end
 
   mount mountpoint do

-    action [ :mount, :enable ]
+    action [:mount, :enable]

     device "#{details[:host]}:#{details[:path]}"
     fstype "nfs"
     options mount_options
     device "#{details[:host]}:#{details[:path]}"
     fstype "nfs"
     options mount_options