Skip to content

Commit

Permalink
Merge pull request #100 from patcon/bugfix/pam-execute-resource
Browse files Browse the repository at this point in the history
Fix bug in execute[update-pam] resource in newer version of Chef.
  • Loading branch information
chris-rock committed Nov 29, 2015
2 parents 6a24b7f + 303b7c9 commit 05fa520
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog

## x.y.z (pending)

* bugfix: Fix issue with `execute[update-pam]` in Chef 12.5+
[#95](https://github.com/hardening-io/chef-os-hardening/issues/95)

## 1.3.0

* feature: implement ipv6 router advertisement settings #78
Expand Down
9 changes: 3 additions & 6 deletions recipes/pam.rb
Expand Up @@ -19,11 +19,6 @@
# limitations under the License.
#

execute 'update-pam' do
command 'pam-auth-update --package'
action :nothing
end

# remove ccreds if not necessary
package 'pam-ccreds' do
package_name node['packages']['pam_ccreds']
Expand Down Expand Up @@ -93,7 +88,9 @@
end
end

execute 'update-pam'
execute 'update-pam' do
command 'pam-auth-update --package'
end

# do config for rhel-family
when 'rhel', 'fedora'
Expand Down

0 comments on commit 05fa520

Please sign in to comment.