From da7eb1155ec34941d71ad2449fd7e5de8a648d49 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Thu, 13 Jan 2011 16:00:36 -0500
Subject: Move mep templates under cn=etc

Fixes: https://fedorahosted.org/freeipa/ticket/760
---
 install/share/host_nis_groups.ldif     | 4 ++--
 install/share/user_private_groups.ldif | 4 ++--
 ipaserver/install/dsinstance.py        | 4 ++--
 ipaserver/plugins/ldap2.py             | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/install/share/host_nis_groups.ldif b/install/share/host_nis_groups.ldif
index 24bb136ec..b29d982cc 100644
--- a/install/share/host_nis_groups.ldif
+++ b/install/share/host_nis_groups.ldif
@@ -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
diff --git a/install/share/user_private_groups.ldif b/install/share/user_private_groups.ldif
index 6a3f49d86..9df729a47 100644
--- a/install/share/user_private_groups.ldif
+++ b/install/share/user_private_groups.ldif
@@ -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
 
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 284bf2429..2bec95ce5 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -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",
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py
index b49a7832f..e2c83d9b2 100644
--- a/ipaserver/plugins/ldap2.py
+++ b/ipaserver/plugins/ldap2.py
@@ -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
-- 
cgit