tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ldap: Fixed ldap::auth when running from Fedora 19 kickstart.

Browse source
This commit is contained in:
Timo Mkinen 2013-09-17 15:37:01 +03:00
parent 98b89b0fe0
commit 917ea4c93d
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ldap/manifests/init.pp
View file

@ -98,18 +98,7 @@ class ldap::auth inherits ldap::client {
package { "sssd": package { "sssd":
ensure => installed, ensure => installed,
} }
if $::operatingsystemrelease < 19 { if versioncmp($::operatingsystemrelease, "18") == 1 {
package { "pam_ldap":
ensure => installed,
before => Package["sssd"],
}
exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --enablesssd --krb5realm='' --update":
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["authconfig"], Package["sssd"], ],
}
} else {
exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --krb5realm='' --update": exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --krb5realm='' --update":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
creates => "/etc/sssd/sssd.conf", creates => "/etc/sssd/sssd.conf",
@ -121,6 +110,17 @@ class ldap::auth inherits ldap::client {
refreshonly => true, refreshonly => true,
before => Augeas["sssd-conf"], before => Augeas["sssd-conf"],
} }
} else {
package { "pam_ldap":
ensure => installed,
before => Package["sssd"],
}
exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --enablesssd --krb5realm='' --update":
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["authconfig"], Package["sssd"], ],
}
} }
augeas { "sssd-conf": augeas { "sssd-conf":
changes => [ changes => [