From 8b3336ef55fa569e4f08307bf939a9698ce70645 Mon Sep 17 00:00:00 2001
From: Jr Aquino <jr.aquino@citrix.com>
Date: Thu, 8 Sep 2011 12:07:26 -0700
Subject: Move Managed Entries into their own container in the replicated
 space.

Repoint cn=Managed Entries,cn=plugins,cn=config in common_setup
Create: cn=Managed Entries,cn=etc,$SUFFIX
Create: cn=Definitions,cn=Managed Entries,cn=etc,$SUFFIX
Create: cn=Templates,cn=Managed Entries,cn=etc,$SUFFIX
Create method for dynamically migrating any and all custom Managed Entries
from the cn=config space into the new container.
Separate the connection creation during update so that a restart can
be performed to initialize changes before performing a delete.
Add wait_for_open_socket() method in installutils

https://fedorahosted.org/freeipa/ticket/1708
---
 install/share/Makefile.am                  |  2 ++
 install/share/host_nis_groups.ldif         |  6 +++---
 install/share/managed-entries.ldif         | 17 +++++++++++++++++
 install/share/repoint-managed-entries.ldif |  5 +++++
 install/share/user_private_groups.ldif     |  6 +++---
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 install/share/managed-entries.ldif
 create mode 100644 install/share/repoint-managed-entries.ldif

(limited to 'install/share')

diff --git a/install/share/Makefile.am b/install/share/Makefile.am
index f2a6a6cae..991f3b478 100644
--- a/install/share/Makefile.am
+++ b/install/share/Makefile.am
@@ -42,6 +42,8 @@ app_DATA =				\
 	schema_compat.uldif		\
 	ldapi.ldif			\
 	wsgi.py				\
+	repoint-managed-entries.ldif	\
+	managed-entries.ldif		\
 	user_private_groups.ldif	\
 	host_nis_groups.ldif		\
 	uuid-ipauniqueid.ldif		\
diff --git a/install/share/host_nis_groups.ldif b/install/share/host_nis_groups.ldif
index bb28c597d..096a881f5 100644
--- a/install/share/host_nis_groups.ldif
+++ b/install/share/host_nis_groups.ldif
@@ -1,4 +1,4 @@
-dn: cn=NGP HGP Template,cn=etc,$SUFFIX
+dn: cn=NGP HGP Template,cn=Templates,cn=Managed Entries,cn=etc,$SUFFIX
 changetype: add
 objectclass: mepTemplateEntry
 cn: NGP HGP Template
@@ -13,11 +13,11 @@ mepMappedAttr: description: ipaNetgroup $$cn
 
 # Changes to this definition need to be reflected in
 # updates/20-host_nis_groups.update
-dn: cn=NGP Definition,cn=Managed Entries,cn=plugins,cn=config
+dn: cn=NGP Definition,cn=Definitions,cn=Managed Entries,cn=etc,$SUFFIX
 changetype: add
 objectclass: extensibleObject
 cn: NGP Definition
 originScope: cn=hostgroups,cn=accounts,$SUFFIX
 originFilter: objectclass=ipahostgroup
 managedBase: cn=ng,cn=alt,$SUFFIX
-managedTemplate: cn=NGP HGP Template,cn=etc,$SUFFIX
+managedTemplate: cn=NGP HGP Template,cn=Templates,cn=Managed Entries,cn=etc,$SUFFIX
diff --git a/install/share/managed-entries.ldif b/install/share/managed-entries.ldif
new file mode 100644
index 000000000..ce65eae59
--- /dev/null
+++ b/install/share/managed-entries.ldif
@@ -0,0 +1,17 @@
+dn: cn=Managed Entries,cn=etc,$SUFFIX
+changetype: add
+objectClass: nsContainer
+objectClass: top
+cn: Managed Entries
+
+dn: cn=Templates,cn=Managed Entries,cn=etc,$SUFFIX
+changetype: add
+objectClass: nsContainer
+objectClass: top
+cn: Templates
+
+dn: cn=Definitions,cn=Managed Entries,cn=etc,$SUFFIX
+changetype: add
+objectClass: nsContainer
+objectClass: top
+cn: Definitions
diff --git a/install/share/repoint-managed-entries.ldif b/install/share/repoint-managed-entries.ldif
new file mode 100644
index 000000000..89666621f
--- /dev/null
+++ b/install/share/repoint-managed-entries.ldif
@@ -0,0 +1,5 @@
+# Repoint Managed Entries to the replicated cn=etc space
+dn: cn=Managed Entries,cn=plugins,cn=config
+changetype: modify
+add: nsslapd-pluginConfigArea
+nsslapd-pluginConfigArea: cn=Definitions,cn=Managed Entries,cn=etc,$SUFFIX
diff --git a/install/share/user_private_groups.ldif b/install/share/user_private_groups.ldif
index 9aed09ba1..0d5656d4f 100644
--- a/install/share/user_private_groups.ldif
+++ b/install/share/user_private_groups.ldif
@@ -1,4 +1,4 @@
-dn: cn=UPG Template,cn=etc,$SUFFIX
+dn: cn=UPG Template,cn=Templates,cn=Managed Entries,cn=etc,$SUFFIX
 changetype: add
 objectclass: mepTemplateEntry
 cn: UPG Template
@@ -12,12 +12,12 @@ mepMappedAttr: description: User private group for $$uid
 
 # Changes to this definition need to be reflected in
 # updates/20-user_private_groups.update
-dn: cn=UPG Definition,cn=Managed Entries,cn=plugins,cn=config
+dn: cn=UPG Definition,cn=Definitions,cn=Managed Entries,cn=etc,$SUFFIX
 changetype: add
 objectclass: extensibleObject
 cn: UPG Definition
 originScope: cn=users,cn=accounts,$SUFFIX
 originFilter: (&(objectclass=posixAccount)(!(description=__no_upg__)))
 managedBase: cn=groups,cn=accounts,$SUFFIX
-managedTemplate: cn=UPG Template,cn=etc,$SUFFIX
+managedTemplate: cn=UPG Template,cn=Templates,cn=Managed Entries,cn=etc,$SUFFIX
 
-- 
cgit