diff options
author | Rob Crittenden <rcritten@redhat.com> | 2010-12-13 13:23:04 -0500 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2010-12-17 17:31:19 -0500 |
commit | 358b28398cad150d6aab873a2d998211bf31d335 (patch) | |
tree | 41d0a097d20be4dd608a726b9e1a491d0abfe201 | |
parent | 1207a7c83f89fccbd38c28e2c0c2307a55956a9d (diff) | |
download | freeipa-358b28398cad150d6aab873a2d998211bf31d335.tar.gz freeipa-358b28398cad150d6aab873a2d998211bf31d335.tar.xz freeipa-358b28398cad150d6aab873a2d998211bf31d335.zip |
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.
-rw-r--r-- | install/share/bootstrap-template.ldif | 135 | ||||
-rw-r--r-- | install/updates/30-automount.update | 22 | ||||
-rw-r--r-- | install/updates/30-groupofhosts.update | 5 | ||||
-rw-r--r-- | install/updates/30-hbacsvc.update | 81 | ||||
-rw-r--r-- | install/updates/30-netgroups.update | 9 | ||||
-rw-r--r-- | install/updates/Makefile.am | 4 |
6 files changed, 135 insertions, 121 deletions
diff --git a/install/share/bootstrap-template.ldif b/install/share/bootstrap-template.ldif index c02925fd4..69dbe3d7a 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 3dd4960d0..000000000 --- a/install/updates/30-automount.update +++ /dev/null @@ -1,22 +0,0 @@ -# Add the default automount entries - -dn: cn=automount,$SUFFIX -add:objectClass: nsContainer -add:cn: automount - -dn: cn=default,cn=automount,$SUFFIX -add:objectClass: nsContainer -add:cn: default - -dn: automountmapname=auto.master,cn=default,cn=automount,$SUFFIX -add:objectClass: automountMap -add:automountMapName: auto.master - -dn: automountmapname=auto.direct,cn=default,cn=automount,$SUFFIX -add:objectClass: automountMap -add:automountMapName: auto.direct - -dn: automountkey=/-,automountmapname=auto.master,cn=default,cn=automount,$SUFFIX -add:objectClass: automount -add:automountKey: '/-' -add:automountInformation: auto.direct diff --git a/install/updates/30-groupofhosts.update b/install/updates/30-groupofhosts.update deleted file mode 100644 index fb39c5e25..000000000 --- a/install/updates/30-groupofhosts.update +++ /dev/null @@ -1,5 +0,0 @@ -dn: cn=hostgroups,cn=accounts,$SUFFIX -add:objectClass: top -add:objectClass: nsContainer -add:cn: hostgroups - diff --git a/install/updates/30-hbacsvc.update b/install/updates/30-hbacsvc.update deleted file mode 100644 index b4145c11f..000000000 --- a/install/updates/30-hbacsvc.update +++ /dev/null @@ -1,81 +0,0 @@ -dn: cn=sshd,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: sshd -default:description: sshd -default:ipauniqueid:autogenerate - -dn: cn=ftp,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: ftp -default:description: ftp -default:ipauniqueid:autogenerate - -dn: cn=su,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: su -default:description: su -default:ipauniqueid:autogenerate - -dn: cn=login,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: login -default:description: login -default:ipauniqueid:autogenerate - -dn: cn=su-l,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: su-l -default:description: su with login shell -default:ipauniqueid:autogenerate - -dn: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: sudo -default:description: sudo -default:ipauniqueid:autogenerate - -dn: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: sudo-i -default:description: sudo-i -default:ipauniqueid:autogenerate - -dn: cn=gdm,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: gdm -default:description: gdm -default:ipauniqueid:autogenerate - -dn: cn=gdm-password,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: gdm-password -default:description: gdm-password -default:ipauniqueid:autogenerate - -dn: cn=kdm,cn=hbacservices,cn=accounts,$SUFFIX -default:objectclass: ipahbacservice -default:objectclass: ipaobject -default:cn: kdm -default:description: kdm -default:ipauniqueid:autogenerate - -dn: cn=SUDO,cn=hbacservicegroups,cn=accounts,$SUFFIX -default:objectClass: ipaobject -default:objectClass: ipahbacservicegroup -default:objectClass: nestedGroup -default:objectClass: groupOfNames -default:objectClass: top -default:cn: SUDO -default:ipauniqueid:autogenerate -default:description: Default group of SUDO related services -default:member: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX -default:member: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX diff --git a/install/updates/30-netgroups.update b/install/updates/30-netgroups.update deleted file mode 100644 index 0a8609e3e..000000000 --- a/install/updates/30-netgroups.update +++ /dev/null @@ -1,9 +0,0 @@ -# Add the default netgroup entries - -dn: cn=alt,$SUFFIX -add:objectClass: nsContainer -add:cn: alt - -dn: cn=ng,cn=alt,$SUFFIX -add:objectClass: nsContainer -add:cn: ng diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am index 48f53d21d..a75542338 100644 --- a/install/updates/Makefile.am +++ b/install/updates/Makefile.am @@ -9,10 +9,6 @@ app_DATA = \ 20-nss_ldap.update \ 20-replication.update \ 20-winsync_index.update \ - 30-automount.update \ - 30-hbacsvc.update \ - 30-groupofhosts.update \ - 30-netgroups.update \ $(NULL) EXTRA_DIST = \ |