Merge pull request #62 from jkroepke/feature/stdlib_fileline

Use file_line instead shellvar

.gitignore

@@ -42,6 +42,8 @@ Gemfile.lock
 
 # idea
 ./idea
+.idea/
+*.iml
 
 # geppetto/eclipse
 .project

manifests/server/debian.pp

@@ -15,15 +15,15 @@
   }
 
   if ($mountd_port != undef){
-    shellvar { 'rpc-mount-options':
-      ensure   => present,
-      target   => '/etc/default/nfs-kernel-server',
-      variable => 'RPCMOUNTDOPTS',
-      value    => "--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}",
+    file_line { 'rpc-mount-options':
+      ensure => present,
+      path   => '/etc/default/nfs-kernel-server',
+      line   => "RPCMOUNTDOPTS=--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}",
+      match  => '^#?RPCMOUNTDOPTS';
     }
 
     if $service_manage {
-      Shellvar['rpc-mount-options'] ~> Service['nfs-kernel-server']
+      File_line['rpc-mount-options'] ~> Service['nfs-kernel-server']
     }
   }
 

manifests/server/redhat.pp

@@ -19,15 +19,15 @@
   }
 
   if ($mountd_port != undef){
-    shellvar { 'rpc-mount-options':
-      ensure   => present,
-      target   => '/etc/sysconfig/nfs',
-      variable => 'MOUNTD_PORT',
-      value    => $mountd_port,
+    file_line { 'rpc-mount-options':
+      ensure => present,
+      path   => '/etc/sysconfig/nfs',
+      line   => "MOUNTD_PORT=${mountd_port}",
+      match  => '^#?MOUNTD_PORT';
     }
 
     if $service_manage {
-      Shellvar['rpc-mount-options'] ~> Service[$service_name]
+      File_line['rpc-mount-options'] ~> Service[$service_name]
     }
   }
 

manifests/server/ubuntu.pp

@@ -15,15 +15,15 @@
   }
 
   if ($mountd_port != undef){
-    shellvar { 'rpc-mount-options':
-      ensure   => present,
-      target   => '/etc/default/nfs-kernel-server',
-      variable => 'RPCMOUNTDOPTS',
-      value    => "--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}",
+    file_line { 'rpc-mount-options':
+      ensure => present,
+      path   => '/etc/default/nfs-kernel-server',
+      line   => "RPCMOUNTDOPTS=--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}",
+      match  => '^#?RPCMOUNTDOPTS';
     }
 
     if $service_manage {
-      Shellvar['rpc-mount-options'] ~> Service['nfs-kernel-server']
+      File_line['rpc-mount-options'] ~> Service['nfs-kernel-server']
     }
   }
 

metadata.json

@@ -68,8 +68,7 @@
   "project_page": "https://github.com/echocat/puppet-nfs",
   "issues_url": "https://github.com/echocat/puppet-nfs/issues",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"},
-    {"name":"herculesteam/augeasproviders_shellvar","version_requirement":">= 2.1.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.8.0 < 5.0.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 < 2.0.0"}
   ]
 }

spec/classes/server_debian_spec.rb

@@ -17,7 +17,7 @@
   context "mountd params set" do
     let(:params) {{ :mountd_port => '4711' }}
     it do
-      should contain_shellvar('rpc-mount-options') #.with( 'ensure' => 'present' )
+      should contain_file_line('rpc-mount-options') #.with( 'ensure' => 'present' )
     end
 
   end

spec/classes/server_redhat_spec.rb

@@ -26,7 +26,7 @@
     context "mountd params set" do
       let(:params) {{ :mountd_port => '4711' }}
       it do
-        should contain_shellvar('rpc-mount-options') #.with( 'ensure' => 'present' )
+        should contain_file_line('rpc-mount-options') #.with( 'ensure' => 'present' )
       end
     end
   end

spec/classes/server_ubuntu_spec.rb

@@ -17,7 +17,7 @@
   context "mountd params set" do
     let(:params) {{ :mountd_port => '4711' }}
     it do
-      should contain_shellvar('rpc-mount-options') #.with( 'ensure' => 'present' )
+      should contain_file_line('rpc-mount-options') #.with( 'ensure' => 'present' )
     end
 
   end