Andrew Bogott has submitted this change and it was merged.
Change subject: ldap: selector outside a resource
......................................................................
ldap: selector outside a resource
Change-Id: I9ef949976fda74977b46b106d411c05f436f9ce7
---
M modules/ldap/manifests/client.pp
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 7f57c8c..6069033 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -60,12 +60,14 @@
mode => '0444',
}
+ $nscd_conf = $::realm ? {
+ 'labs' => 'puppet:///modules/ldap/nscd-labs.conf',
+ default => 'puppet:///modules/ldap/nscd.conf',
+ }
+
file { '/etc/nscd.conf':
notify => Service['nscd'],
- source => $::realm ? {
- 'labs' => 'puppet:///modules/ldap/nscd-labs.conf',
- default => 'puppet:///modules/ldap/nscd.conf',
- }
+ source => $nscd_conf,
}
file { '/etc/nsswitch.conf':
--
To view, visit https://gerrit.wikimedia.org/r/195524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ef949976fda74977b46b106d411c05f436f9ce7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
