diff --git a/kerberos/manifests/init.pp b/kerberos/manifests/init.pp index 25c41f0..650f4ab 100644 --- a/kerberos/manifests/init.pp +++ b/kerberos/manifests/init.pp @@ -74,6 +74,8 @@ class kerberos::client { # class kerberos::auth { + include pam::common + include kerberos::client $kdclist = inline_template('<%= kerberos_kdc.join(" ") -%>') @@ -86,7 +88,7 @@ class kerberos::auth { path => "/bin:/usr/bin:/sbin:/usr/sbin", unless => "egrep '^USEKERBEROS=yes\$' /etc/sysconfig/authconfig", before => Class["kerberos::client"], - require => Package["pam_krb5"], + require => Package["authconfig", "pam_krb5"], } } default: { diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp index e14c9fc..4f1e731 100644 --- a/ldap/manifests/init.pp +++ b/ldap/manifests/init.pp @@ -14,6 +14,8 @@ # class ldap::auth inherits ldap::client { + include pam::common + tag("bootstrap") $ldap_uri = inline_template('<%= ldap_server.join(" ") -%>') @@ -31,7 +33,7 @@ class ldap::auth inherits ldap::client { before => [ Augeas["nslcd-conf"], Augeas["pam-ldap-conf"], File["/etc/openldap/ldap.conf"], ], - require => Package["nss-pam-ldapd"], + require => Package["authconfig", "nss-pam-ldapd"], } augeas { "nslcd-conf": changes => [ "set pagesize 500", @@ -69,7 +71,7 @@ class ldap::auth inherits ldap::client { unless => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"', before => [ Augeas["pam-ldap-conf"], File["/etc/openldap/ldap.conf"], ], - require => Package["nss_ldap"], + require => Package["authconfig", "nss_ldap"], } augeas { "pam-ldap-conf": context => "/files/etc/ldap.conf", @@ -100,7 +102,7 @@ class ldap::auth inherits ldap::client { path => "/bin:/usr/bin:/sbin:/usr/sbin", unless => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"', before => Augeas["sssd-conf"], - require => [ Package["sssd"], Package["pam_ldap"], ], + require => Package["authconfig", "sssd", "pam_ldap"], } augeas { "sssd-conf": changes => [ diff --git a/pam/manifests/init.pp b/pam/manifests/init.pp index 6fd7ee7..7006104 100644 --- a/pam/manifests/init.pp +++ b/pam/manifests/init.pp @@ -4,6 +4,11 @@ class pam::common { case $::operatingsystem { + "centos","redhat","fedora": { + package { "authconfig": + ensure => installed, + } + } "ubuntu": { package { "libpam-runtime": ensure => installed, @@ -28,8 +33,9 @@ class pam::mkhomedir { case $::operatingsystem { "centos","redhat","fedora": { exec { "authconfig --enablemkhomedir --update": - path => "/bin:/usr/bin:/sbin:/usr/sbin", - unless => "egrep '^USEMKHOMEDIR=yes\$' /etc/sysconfig/authconfig", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + unless => "egrep '^USEMKHOMEDIR=yes\$' /etc/sysconfig/authconfig", + require => Package["authconfig"], } } "ubuntu": {