X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..65cf383861b6a6b2568f22aab2e2f0b34a5198e0:/cookbooks/nfs/recipes/default.rb diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb index 8d44e2bd6..216e825f2 100644 --- 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, @@ -20,18 +20,18 @@ 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 + 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" - mode 0755 + mode "755" recursive true - not_if { File.exist?(mountpoint) } + not_if { ::File.exist?(mountpoint) } end mount mountpoint do