Move a bunch of objects created by the updater into the bootstrap ldif.
It is cleaner to do it this way (and probably a bit faster too).
rob
From 4094295ade03897b62f14b1b5ff4a59227fadf1b Mon Sep 17 00:00:00 2001
From: Rob Crittenden rcrit...@redhat.com
Date: Mon, 13 Dec 2010 13:23:04 -0500
Subject: [PATCH] Move automount, default HBAC services, netgroup and hostgroup bootstrapping.
There is no need for these to be done as updates, just add these entries
to the bootstrapping.
---
install/share/bootstrap-template.ldif | 135
install/updates/30-automount.update| 22 -
install/updates/30-groupofhosts.update |5 -
install/updates/30-hbacsvc.update | 81 ---
install/updates/30-netgroups.update|9 --
install/updates/Makefile.am|4 -
6 files changed, 135 insertions(+), 121 deletions(-)
delete mode 100644 install/updates/30-automount.update
delete mode 100644 install/updates/30-groupofhosts.update
delete mode 100644 install/updates/30-hbacsvc.update
delete mode 100644 install/updates/30-netgroups.update
diff --git a/install/share/bootstrap-template.ldif b/install/share/bootstrap-template.ldif
index c02925f..69dbe3d 100644
--- a/install/share/bootstrap-template.ldif
+++ b/install/share/bootstrap-template.ldif
@@ -28,6 +28,48 @@ objectClass: top
objectClass: nsContainer
cn: computers
+dn: cn=hostgroups,cn=accounts,$SUFFIX
+changetype: add
+objectClass: top
+objectClass: nsContainer
+cn: hostgroups
+
+dn: cn=alt,$SUFFIX
+changetype: add
+objectClass: nsContainer
+cn: alt
+
+dn: cn=ng,cn=alt,$SUFFIX
+changetype: add
+objectClass: nsContainer
+cn: ng
+
+dn: cn=automount,$SUFFIX
+changetype: add
+objectClass: nsContainer
+cn: automount
+
+dn: cn=default,cn=automount,$SUFFIX
+changetype: add
+objectClass: nsContainer
+cn: default
+
+dn: automountmapname=auto.master,cn=default,cn=automount,$SUFFIX
+changetype: add
+objectClass: automountMap
+automountMapName: auto.master
+
+dn: automountmapname=auto.direct,cn=default,cn=automount,$SUFFIX
+changetype: add
+objectClass: automountMap
+automountMapName: auto.direct
+
+dn: automountkey=/-,automountmapname=auto.master,cn=default,cn=automount,$SUFFIX
+changetype: add
+objectClass: automount
+automountKey: /-
+automountInformation: auto.direct
+
dn: cn=hbacservices,cn=accounts,$SUFFIX
changetype: add
objectClass: top
@@ -190,6 +232,99 @@ gidNumber: eval($IDSTART+2)
description: Limited admins who can edit other users
cn: editors
+dn: cn=sshd,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: sshd
+description: sshd
+ipauniqueid:autogenerate
+
+dn: cn=ftp,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: ftp
+description: ftp
+ipauniqueid:autogenerate
+
+dn: cn=su,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: su
+description: su
+ipauniqueid:autogenerate
+
+dn: cn=login,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: login
+description: login
+ipauniqueid:autogenerate
+
+dn: cn=su-l,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: su-l
+description: su with login shell
+ipauniqueid:autogenerate
+
+dn: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: sudo
+description: sudo
+ipauniqueid:autogenerate
+
+dn: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: sudo-i
+description: sudo-i
+ipauniqueid:autogenerate
+
+dn: cn=gdm,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: gdm
+description: gdm
+ipauniqueid:autogenerate
+
+dn: cn=gdm-password,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: gdm-password
+description: gdm-password
+ipauniqueid:autogenerate
+
+dn: cn=kdm,cn=hbacservices,cn=accounts,$SUFFIX
+changetype: add
+objectclass: ipahbacservice
+objectclass: ipaobject
+cn: kdm
+description: kdm
+ipauniqueid:autogenerate
+
+dn: cn=SUDO,cn=hbacservicegroups,cn=accounts,$SUFFIX
+changetype: add
+objectClass: ipaobject
+objectClass: ipahbacservicegroup
+objectClass: nestedGroup
+objectClass: groupOfNames
+objectClass: top
+cn: SUDO
+ipauniqueid:autogenerate
+description: Default group of SUDO related services
+member: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX
+member: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX
+
dn: cn=ipaConfig,cn=etc,$SUFFIX
changetype: add
objectClass: nsContainer
diff --git a/install/updates/30-automount.update b/install/updates/30-automount.update
deleted file mode 100644
index 3dd4960..000
--- a/install/updates/30-automount.update
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add
