diff --git a/.gitignore b/.gitignore index 5846875..dd61dec 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,8 @@ Gemfile.lock # idea ./idea +.idea/ +*.iml # geppetto/eclipse .project diff --git a/CHANGELOG.md b/CHANGELOG.md index 3637af7..6f94703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 2016-01-18 - 1.8.0 (Feature release) + +!!! raise veriosn of requirements for stdlib to >4.8.0 !!! + +#### Features: + +- (ba021e9) #62 Remove herculesteam/augeasproviders_shellvar dependency + ## 2016-01-08 - 1.7.2 (Bugfix release) #### Bugfixes: diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp index 22671a0..019f9d3 100644 --- a/manifests/server/debian.pp +++ b/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'] } } diff --git a/manifests/server/redhat.pp b/manifests/server/redhat.pp index 5baae87..a5bca31 100644 --- a/manifests/server/redhat.pp +++ b/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] } } diff --git a/manifests/server/ubuntu.pp b/manifests/server/ubuntu.pp index 0f52df9..698e38b 100644 --- a/manifests/server/ubuntu.pp +++ b/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'] } } diff --git a/metadata.json b/metadata.json index 79841e0..116cd6a 100644 --- a/metadata.json +++ b/metadata.json @@ -56,11 +56,11 @@ }, { "name": "puppet", - "version_requirement": ">=2.7.20 <5.0.0" + "version_requirement": ">=3.0.0 <5.0.0" } ], "name": "echocat-nfs", - "version": "1.7.2", + "version": "1.8.0", "source": "git clone https://github.com/echocat/puppet-nfs.git", "author": "echocat", "license": "Apache-2.0", @@ -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"} ] } diff --git a/spec/classes/server_debian_spec.rb b/spec/classes/server_debian_spec.rb index 5208b43..04a8f85 100644 --- a/spec/classes/server_debian_spec.rb +++ b/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 diff --git a/spec/classes/server_redhat_spec.rb b/spec/classes/server_redhat_spec.rb index 81a0da6..f41b119 100644 --- a/spec/classes/server_redhat_spec.rb +++ b/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 diff --git a/spec/classes/server_ubuntu_spec.rb b/spec/classes/server_ubuntu_spec.rb index 731e0bd..653bdec 100644 --- a/spec/classes/server_ubuntu_spec.rb +++ b/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