Showing with 11 additions and 7 deletions.
  1. +1 −1 Modulefile
  2. +3 −2 manifests/limits.pp
  3. +1 −1 metadata.json
  4. +6 −3 spec/classes/limits_spec.rb
2 changes: 1 addition & 1 deletion Modulefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'ghoneycutt-pam'
version '2.7.0'
version '2.7.1'
source 'git://github.com/ghoneycutt/puppet-module-pam.git'
author 'ghoneycutt'
license 'Apache License, Version 2.0'
Expand Down
5 changes: 3 additions & 2 deletions manifests/limits.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
include pam

# ensure target exists
include common
common::mkdir_p { $limits_d_dir: }

file { 'limits_d':
Expand All @@ -31,7 +30,9 @@
owner => 'root',
group => 'root',
mode => $limits_d_dir_mode,
require => Package[$pam::my_package_name],
require => [ Package[$pam::my_package_name],
Common::Mkdir_p[$limits_d_dir],
],
}

file { 'limits_conf':
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ghoneycutt-pam",
"version": "2.7.0",
"version": "2.7.1",
"author": "ghoneycutt",
"summary": "Manage PAM",
"license": "Apache License, Version 2.0",
Expand Down
9 changes: 6 additions & 3 deletions spec/classes/limits_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,16 @@

it { should contain_class('pam') }

it { should contain_common__mkdir_p('/etc/security/limits.d') }

it {
should contain_file('limits_d').with({
'ensure' => 'directory',
'path' => '/etc/security/limits.d',
'owner' => 'root',
'group' => 'root',
'mode' => '0750',
'require' => [ 'Package[pam]', 'Package[util-linux]' ],
'require' => [ 'Package[pam]', 'Package[util-linux]', 'Common::Mkdir_p[/etc/security/limits.d]' ],
})
}
end
Expand All @@ -123,7 +125,8 @@
end

it { should contain_class('pam') }
it { should contain_class('common') }

it { should contain_common__mkdir_p('/custom/security/limits.d') }

it {
should contain_file('limits_d').with({
Expand All @@ -132,7 +135,7 @@
'owner' => 'root',
'group' => 'root',
'mode' => '0700',
'require' => [ 'Package[pam]', 'Package[util-linux]' ],
'require' => [ 'Package[pam]', 'Package[util-linux]', 'Common::Mkdir_p[/custom/security/limits.d]' ],
})
}
end
Expand Down