IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move mep templates under cn=etc

Browse Source 
Fixes: https://fedorahosted.org/freeipa/ticket/760
This commit is contained in:
Simo Sorce 2011-01-13 16:00:36 -05:00
parent 5549dca50e
commit da7eb1155e
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/share/host_nis_groups.ldif
View File

@ -1,4 +1,4 @@
dn: cn=NGP HGP Template,$SUFFIX
dn: cn=NGP HGP Template,cn=etc,$SUFFIX
changetype: add
objectclass: mepTemplateEntry
cn: NGP HGP Template
@ -18,4 +18,4 @@ cn: HGP Definition
originScope: cn=hostgroups,cn=accounts,$SUFFIX
originFilter: objectclass=ipahostgroup
managedBase: cn=ng,cn=alt,$SUFFIX
managedTemplate: cn=NGP HGP Template,$SUFFIX
managedTemplate: cn=NGP HGP Template,cn=etc,$SUFFIX

4
install/share/user_private_groups.ldif
View File

@ -1,4 +1,4 @@
dn: cn=UPG Template,$SUFFIX
dn: cn=UPG Template,cn=etc,$SUFFIX
changetype: add
objectclass: mepTemplateEntry
cn: UPG Template
@ -17,5 +17,5 @@ cn: UPG Definition
originScope: cn=users,cn=accounts,$SUFFIX
originFilter: objectclass=posixAccount
managedBase: cn=groups,cn=accounts,$SUFFIX
managedTemplate: cn=UPG Template,$SUFFIX
managedTemplate: cn=UPG Template,cn=etc,$SUFFIX

4
ipaserver/install/dsinstance.py
View File

@ -208,10 +208,10 @@ class DsInstance(service.Service):
self.step("configuring ssl for ds instance", self.__enable_ssl)
self.step("configuring certmap.conf", self.__certmap_conf)
self.step("restarting directory server", self.__restart_instance)
self.step("configuring user private groups", self.__user_private_groups)
self.step("configuring netgroups from hostgroups", self.__host_nis_groups)
def __common_post_setup(self):
self.step("configuring user private groups", self.__user_private_groups)
self.step("configuring netgroups from hostgroups", self.__host_nis_groups)
self.step("initializing group membership", self.init_memberof)
self.step("adding master entry", self.__add_master_entry)
self.step("configuring Posix uid/gid generation",

3
ipaserver/plugins/ldap2.py
View File

@ -627,7 +627,8 @@ class ldap2(CrudBackend, Encoder):
if _upg is None:
try:
upg_entry = self.conn.search_s(
'cn=UPG Template, %s' % api.env.basedn, _ldap.SCOPE_BASE,
'cn=UPG Template,cn=etc,%s' % api.env.basedn,
_ldap.SCOPE_BASE,
attrlist=['*']
)[0]
_upg = True