From d399d3d05a3d5bfe6555ae6a39dc6e28f0b906a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Tue, 17 Sep 2013 14:35:53 +0300
Subject: [PATCH] ldap: Ugly kludges to get ldap::auth working on Fedora 19.

---
 ldap/manifests/init.pp | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index 7e9efac..a59883a 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -95,14 +95,32 @@ class ldap::auth inherits ldap::client {
             }
         }
         Fedora: {
-            package { [ "sssd", "pam_ldap", ]:
+            package { "sssd":
                 ensure => installed,
             }
-            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", "sssd", "pam_ldap"],
+            if $::operatingsystemrelease < 19 {
+                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":
+                    path    => "/bin:/usr/bin:/sbin:/usr/sbin",
+                    creates => "/etc/sssd/sssd.conf",
+                    require => [ Package["authconfig"], Package["sssd"], ],
+                    notify  => Exec["authconfig --enablesssd --update"],
+                }
+                exec { "authconfig --enablesssd --update":
+                    path        => "/bin:/usr/bin:/sbin:/usr/sbin",
+                    refreshonly => true,
+                    before      => Augeas["sssd-conf"],
+                }
             }
             augeas { "sssd-conf":
                 changes => [
@@ -113,7 +131,7 @@ class ldap::auth inherits ldap::client {
                 ],
                 incl    => "/etc/sssd/sssd.conf",
                 lens    => "MySQL.lns",
-                before  => Service["sssd"],
+                notify  => Service["sssd"],
             }
             service { "sssd":
                 ensure => running,