http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96140
Revision: 96140
Author: laner
Date: 2011-09-02 18:45:49 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Change group ou location, since we've changed this in the cluster. TThese
scripts really need to be updated to use a config file for this stuff.
Modified Paths:
--------------
trunk/tools/subversion/user-management/add-ldap-group
trunk/tools/subversion/user-management/ldaplist
trunk/tools/subversion/user-management/modify-ldap-group
Modified: trunk/tools/subversion/user-management/add-ldap-group
===================================================================
--- trunk/tools/subversion/user-management/add-ldap-group 2011-09-02
18:28:28 UTC (rev 96139)
+++ trunk/tools/subversion/user-management/add-ldap-group 2011-09-02
18:45:49 UTC (rev 96140)
@@ -34,7 +34,7 @@
try:
groupname = args[0]
- dn = 'cn=' + groupname + ',ou=group,' + base
+ dn = 'cn=' + groupname + ',ou=groups,' + base
cn = groupname
objectClasses = ['posixGroup', 'groupOfNames', 'top']
if options.gidNumber:
Modified: trunk/tools/subversion/user-management/ldaplist
===================================================================
--- trunk/tools/subversion/user-management/ldaplist 2011-09-02 18:28:28 UTC
(rev 96139)
+++ trunk/tools/subversion/user-management/ldaplist 2011-09-02 18:45:49 UTC
(rev 96140)
@@ -30,7 +30,7 @@
base = ldapSupportLib.getBase()
- objectbasedns = {"base":base, "passwd":"ou=people,"+base,
"group":"ou=group,"+base, "netgroup":"ou=netgroup,"+base,
"hosts":"ou=hosts,"+base, "automount":base,
"auto_*":"nisMapName=auto_AUTO,"+base, "uids":"ou=uids,"+base}
+ objectbasedns = {"base":base, "passwd":"ou=people,"+base,
"group":"ou=groups,"+base, "netgroup":"ou=netgroup,"+base,
"hosts":"ou=hosts,"+base, "automount":base,
"auto_*":"nisMapName=auto_AUTO,"+base, "uids":"ou=uids,"+base}
objectdefaulttypes = {"base":"none", "passwd":"uid", "group":"cn",
"netgroup":"cn", "hosts":"cn", "automount":"nisMapName", "auto_*":"cn",
"uids":"cn"}
objectobjectclasses = {"base":"none", "passwd":"posixaccount",
"group":"posixgroup", "netgroup":"nisNetGroup", "hosts":"iphost",
"automount":"nisMap", "auto_*":"nisObject", "uids":"inetOrgPerson"}
Modified: trunk/tools/subversion/user-management/modify-ldap-group
===================================================================
--- trunk/tools/subversion/user-management/modify-ldap-group 2011-09-02
18:28:28 UTC (rev 96139)
+++ trunk/tools/subversion/user-management/modify-ldap-group 2011-09-02
18:45:49 UTC (rev 96140)
@@ -38,7 +38,7 @@
# w00t We're in!
try:
groupname = args[0]
- PosixData = ds.search_s("ou=group," +
base,ldap.SCOPE_SUBTREE,"(&(objectclass=posixGroup)(cn=" + groupname + "))")
+ PosixData = ds.search_s("ou=groups," +
base,ldap.SCOPE_SUBTREE,"(&(objectclass=posixGroup)(cn=" + groupname + "))")
if not PosixData:
raise ldap.NO_SUCH_OBJECT()
dn = PosixData[0][0]
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
