From 43b565949be37639ec8ea80f989ec40c8466309a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Wed, 6 Jun 2012 11:59:49 +0300 Subject: [PATCH] Fixed rpc.statd port on Fedora. --- nfs/manifests/init.pp | 6 +++--- nfs/{files/nfs.sysconfig => templates/nfs.sysconfig.erb} | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) rename nfs/{files/nfs.sysconfig => templates/nfs.sysconfig.erb} (92%) diff --git a/nfs/manifests/init.pp b/nfs/manifests/init.pp index e598a34..da7cf46 100644 --- a/nfs/manifests/init.pp +++ b/nfs/manifests/init.pp @@ -43,10 +43,10 @@ class nfs::server inherits nfs::client { file { "/etc/sysconfig/nfs": ensure => present, - source => "puppet:///modules/nfs/nfs.sysconfig", + content => template("nfs/nfs.sysconfig.erb"), mode => "0644", - owner => root, - group => root, + owner => "root", + group => "root", notify => Service["nfs"], } diff --git a/nfs/files/nfs.sysconfig b/nfs/templates/nfs.sysconfig.erb similarity index 92% rename from nfs/files/nfs.sysconfig rename to nfs/templates/nfs.sysconfig.erb index 4081cac..7741d44 100644 --- a/nfs/files/nfs.sysconfig +++ b/nfs/templates/nfs.sysconfig.erb @@ -40,10 +40,15 @@ RPCMOUNTDOPTS="--no-nfs-version 4" MOUNTD_PORT=4002 # # +<% if @operatingsystem == 'Fedora' -%> +# Optional arguments passed to rpc.statd. See rpc.statd(8) +STATDARG="-p 4000" +<% else -%> # Optional arguments passed to rpc.statd. See rpc.statd(8) #STATDARG="" # Port rpc.statd should listen on. STATD_PORT=4000 +<% end -%> # Outgoing port statd should used. The default is port # is random #STATD_OUTGOING_PORT=2020