From 306d47c91885a1200b0f5dda22f573a86150acf9 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Mon, 14 Jul 2014 15:24:48 -0700 Subject: [PATCH 1/3] Puppet-lint fix --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 83743fc..6f40c9c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,7 +2,7 @@ class nsswitch::params { case $::osfamily { - + 'Debian': { $package = [ 'nscd', 'libnss-ldap' ] From 9cb3c62668e95a987f31ac8ddaa6c3d1b3a08128 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Thu, 7 Aug 2014 10:16:36 -0700 Subject: [PATCH 2/3] Puppet-lint fixes. Moving conditionals out of resource declarations --- manifests/init.pp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1515725..6411f8d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -34,19 +34,23 @@ include nsswitch::params + $service_ensure = $module_type ? { + 'ldap' => running, + default => stopped, + } + + $service_enable = $module_type ? { + 'ldap' => true, + default => false, + } + package { $nsswitch::params::package: ensure => $ensure } service { $nsswitch::params::service: - ensure => $module_type ? { - 'ldap' => running, - default => stopped, - }, - enable => $module_type ? { - 'ldap' => true, - default => false, - }, + ensure => $service_ensure, + enable => $service_enable, name => $nsswitch::params::script, pattern => $nsswitch::params::pattern, hasstatus => true, From d4deb03909c6f011ce6e99651fb7a9b9f180e9a5 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Tue, 18 Nov 2014 14:59:52 -0800 Subject: [PATCH 3/3] Adding missing params to nslcd.conf --- templates/nslcd.conf.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/nslcd.conf.erb b/templates/nslcd.conf.erb index 4c446f9..83fa9d3 100644 --- a/templates/nslcd.conf.erb +++ b/templates/nslcd.conf.erb @@ -13,3 +13,5 @@ timelimit 5 bind_timelimit 10 idle_timelimit 3600 +ssl no +tls_cacertdir /etc/openldap/cacerts