https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115695
Revision: 115695
Author: laner
Date: 2012-08-28 23:14:36 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Change search based on keystone's LDAP DIT
Modified Paths:
--------------
trunk/tools/subversion/user-management/manage-exports
trunk/tools/subversion/user-management/manage-volumes
Modified: trunk/tools/subversion/user-management/manage-exports
===================================================================
--- trunk/tools/subversion/user-management/manage-exports 2012-08-28
19:44:40 UTC (rev 115694)
+++ trunk/tools/subversion/user-management/manage-exports 2012-08-28
23:14:36 UTC (rev 115695)
@@ -41,7 +41,7 @@
# w00t We're in!
try:
- projectdata = ds.search_s("ou=projects," +
base,ldap.SCOPE_SUBTREE,"(&(cn=*)(owner=*))")
+ projectdata = ds.search_s("ou=projects," +
base,ldap.SCOPE_SUBTREE,"(objectclass=groupofnames)")
usersdata = ldapSupportLib.getUsers(ds, '*')
projects = []
if not projectdata:
Modified: trunk/tools/subversion/user-management/manage-volumes
===================================================================
--- trunk/tools/subversion/user-management/manage-volumes 2012-08-28
19:44:40 UTC (rev 115694)
+++ trunk/tools/subversion/user-management/manage-volumes 2012-08-28
23:14:36 UTC (rev 115695)
@@ -51,7 +51,7 @@
base = ldapSupportLib.getBase()
ds = ldapSupportLib.connect()
- projectdata = self.search_s(ds,"ou=projects," +
base,ldap.SCOPE_SUBTREE,"(&(cn=*)(owner=*))")
+ projectdata = self.search_s(ds,"ou=projects," +
base,ldap.SCOPE_SUBTREE,"(objectclass=groupofnames)")
hostdata = self.search_s(ds,"ou=hosts," +
base,ldap.SCOPE_SUBTREE,"(puppetvar=instanceproject=*)",
['puppetvar','aRecord'])
volumedata = self.ssh_exec_command('sudo gluster volume info',
True, True)
project_hosts = self.get_hosts(hostdata)
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
