Faidon Liambotis has submitted this change and it was merged.
Change subject: sudo: move sudo-ldap Package from "ldap" to "sudo"
......................................................................
sudo: move sudo-ldap Package from "ldap" to "sudo"
sudo-ldap is a sudo replacement, so it makes more sense semantically to
have it in the sudo module. Practically speaking, it also helps with
handling Package/sudoers dependencies, as it will soon become evident.
Change-Id: I98fa182c7b72088185860542d175bf66259d628e
---
M modules/ldap/manifests/client.pp
M modules/sudo/manifests/init.pp
2 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index dea87f1..f8e3ab4 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -261,11 +261,7 @@
}
class ldap::client::sudo($ldapconfig) {
- if ! defined (Package['sudo-ldap']) {
- package { 'sudo-ldap':
- ensure => latest,
- }
- }
+ require sudo
# sudo-ldap.conf has always been a duplicate of /etc/ldap/ldap.conf.
# Make it official.
diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 4c8d98e..749567dd5 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,9 +1,10 @@
class sudo {
- if $::realm == 'labs' {
- # We use sudo-ldap, defined elsewhere.
- } else {
- package { 'sudo':
- ensure => installed,
- }
+ $package = $::realm ? {
+ 'labs' => 'sudo-ldap',
+ default => 'sudo',
+ }
+
+ package { $package:
+ ensure => installed,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/180502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98fa182c7b72088185860542d175bf66259d628e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[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
