Dzahn has submitted this change and it was merged.
Change subject: ldaplist: Switch to new servicegroups structure
......................................................................
ldaplist: Switch to new servicegroups structure
This change amends "ldaplist -l servicegroups" to show the "new"
servicegroups structure ("${PROJECT}.${SERVICEGROUP}"). The old list
("local-${SERVICEGROUP}") is still available by "ldaplist -l
servicegroups.old".
Change-Id: I810f19299ed05d1e2062b7cad6e8b8696205fa47
---
M modules/ldap/files/scripts/ldaplist
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ldap/files/scripts/ldaplist
b/modules/ldap/files/scripts/ldaplist
index b80683a..42d7bb6 100755
--- a/modules/ldap/files/scripts/ldaplist
+++ b/modules/ldap/files/scripts/ldaplist
@@ -48,7 +48,8 @@
"automount": base,
"auto_*": "nisMapName=auto_AUTO," + base,
"uids": "ou=uids," + base,
- "servicegroups": "ou=projects," + base}
+ "servicegroups.old": "ou=projects," + base,
+ "servicegroups": "ou=servicegroups," + base}
objectdefaulttypes = {"base": "none",
"passwd": "uid",
"group": "cn",
@@ -57,6 +58,7 @@
"automount": "nisMapName",
"auto_*": "cn",
"uids": "cn",
+ "servicegroups.old": "cn",
"servicegroups": "cn"}
objectobjectclasses = {"base": "none",
"passwd": "posixaccount",
@@ -66,6 +68,7 @@
"automount": "nisMap",
"auto_*": "nisObject",
"uids": "inetOrgPerson",
+ "servicegroups.old": "posixgroup",
"servicegroups": "posixgroup"}
if options.showdatabase:
--
To view, visit https://gerrit.wikimedia.org/r/117313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I810f19299ed05d1e2062b7cad6e8b8696205fa47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Petrb <benap...@gmail.com>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
