[Freeipa-devel] [PATCH] Consolidate update files
Jason Gerard DeRose
jderose at redhat.com
Fri Feb 6 20:20:03 UTC 2009
On Thu, 2009-02-05 at 15:08 -0500, Rob Crittenden wrote:
> Update files are used to load schema or set up or change entries in the
> DIT over LDAP. There were some in Jason's tree and in the old v1 tree.
> This patch consolidates them into one location.
>
> rob
ack.
> plain text document attachment (freeipa-118-update.patch)
> >From fe656f2720847170af00c71ecc925c0d32045621 Mon Sep 17 00:00:00 2001
> From: Rob Crittenden <rcritten at redhat.com>
> Date: Thu, 5 Feb 2009 09:39:17 -0500
> Subject: [PATCH] Consolidate all update files into one location
>
> ---
> install/updates/Makefile.am | 11 ++++--
> install/updates/automount.update | 54 +++++++++++++++++++++++++++++++++
> install/updates/groupofhosts.update | 5 +++
> install/updates/host.update | 25 +++++++++++++++
> ipaserver/updates/automount.update | 54 ---------------------------------
> ipaserver/updates/groupofhosts.update | 5 ---
> ipaserver/updates/host.update | 25 ---------------
> 7 files changed, 91 insertions(+), 88 deletions(-)
> create mode 100644 install/updates/automount.update
> create mode 100644 install/updates/groupofhosts.update
> create mode 100644 install/updates/host.update
> delete mode 100644 ipaserver/updates/automount.update
> delete mode 100644 ipaserver/updates/groupofhosts.update
> delete mode 100644 ipaserver/updates/host.update
>
> diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am
> index 11d20dd..002a83b 100644
> --- a/install/updates/Makefile.am
> +++ b/install/updates/Makefile.am
> @@ -2,12 +2,15 @@ NULL =
>
> appdir = $(IPA_DATA_DIR)/updates
> app_DATA = \
> - RFC4876.update \
> - RFC2307bis.update \
> + automount.update \
> + groupofhosts.update \
> + host.update \
> + indices.update \
> nss_ldap.update \
> - winsync_index.update \
> replication.update \
> - indices.update \
> + RFC2307bis.update \
> + RFC4876.update \
> + winsync_index.update \
> $(NULL)
>
> EXTRA_DIST = \
> diff --git a/install/updates/automount.update b/install/updates/automount.update
> new file mode 100644
> index 0000000..13d9a6d
> --- /dev/null
> +++ b/install/updates/automount.update
> @@ -0,0 +1,54 @@
> +#
> +# An automount schema based on RFC 2307-bis.
> +#
> +# This schema defines new automount and automountMap objectclasses to represent
> +# the automount maps and their entries.
> +#
> +dn: cn=schema
> +add:attributeTypes:
> + ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
> + DESC 'automount Map Name'
> + EQUALITY caseExactIA5Match
> + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
> + X-ORIGIN 'RFC 2307bis' )
> +add:attributeTypes:
> + ( 1.3.6.1.1.1.1.32 NAME 'automountKey'
> + DESC 'Automount Key value'
> + EQUALITY caseExactIA5Match
> + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
> + X-ORIGIN 'RFC 2307bis' )
> +add:attributeTypes:
> + ( 1.3.6.1.1.1.1.33 NAME 'automountInformation'
> + DESC 'Automount information'
> + EQUALITY caseExactIA5Match
> + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
> + X-ORIGIN 'RFC 2307bis' )
> +add:objectClasses:
> + ( 1.3.6.1.1.1.2.16 NAME 'automountMap'
> + DESC 'Automount Map information' SUP top
> + STRUCTURAL MUST automountMapName MAY description
> + X-ORIGIN 'RFC 2307bis' )
> +add:objectClasses:
> + ( 1.3.6.1.1.1.2.17 NAME 'automount'
> + DESC 'Automount information' SUP top STRUCTURAL
> + MUST ( automountKey $ automountInformation ) MAY description
> + X-ORIGIN 'RFC 2307bis' )
> +
> +# Add the default automount entries
> +
> +dn: cn=automount,$SUFFIX
> +add:objectClass: nsContainer
> +add:cn: automount
> +
> +dn: automountmapname=auto.master,cn=automount,$SUFFIX
> +add:objectClass: automountMap
> +add:automountMapName: auto.master
> +
> +dn: automountkey=/-,automountmapname=auto.master,cn=automount,$SUFFIX
> +add:objectClass: automount
> +add:automountKey: '/-'
> +add:automountInformation: auto.direct
> +
> +dn: automountmapname=auto.direct,cn=automount,$SUFFIX
> +add:objectClass: automountMap
> +add:automountMapName: auto.direct
> diff --git a/install/updates/groupofhosts.update b/install/updates/groupofhosts.update
> new file mode 100644
> index 0000000..fb39c5e
> --- /dev/null
> +++ b/install/updates/groupofhosts.update
> @@ -0,0 +1,5 @@
> +dn: cn=hostgroups,cn=accounts,$SUFFIX
> +add:objectClass: top
> +add:objectClass: nsContainer
> +add:cn: hostgroups
> +
> diff --git a/install/updates/host.update b/install/updates/host.update
> new file mode 100644
> index 0000000..f5ecda5
> --- /dev/null
> +++ b/install/updates/host.update
> @@ -0,0 +1,25 @@
> +#
> +# Schema for IPA Hosts
> +#
> +dn: cn=schema
> +add: attributeTypes:
> + ( 2.16.840.1.113730.3.8.3.10 NAME 'ipaClientVersion'
> + DESC 'Text string describing client version of the IPA software installed'
> + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
> + X-ORIGIN 'IPA v2' )
> +
> +add: attributeTypes:
> + ( 2.16.840.1.113730.3.8.3.11 NAME 'enrolledBy'
> + DESC 'DN of administrator who performed manual enrollment of the host'
> + SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
> + X-ORIGIN 'IPA v2' )
> +add: objectClasses:
> + ( 2.16.840.1.113730.3.8.4.2 NAME 'ipaHost'
> + AUXILIARY
> + MAY ( userPassword $ ipaClientVersion $ enrolledBy)
> + X-ORIGIN 'IPA v2' )
> +add: objectClasses:
> + ( 2.5.6.21 NAME 'pkiUser'
> + SUP top AUXILIARY
> + MAY ( userCertificate )
> + X-ORIGIN 'RFC 2587' )
> diff --git a/ipaserver/updates/automount.update b/ipaserver/updates/automount.update
> deleted file mode 100644
> index 13d9a6d..0000000
> --- a/ipaserver/updates/automount.update
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -#
> -# An automount schema based on RFC 2307-bis.
> -#
> -# This schema defines new automount and automountMap objectclasses to represent
> -# the automount maps and their entries.
> -#
> -dn: cn=schema
> -add:attributeTypes:
> - ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
> - DESC 'automount Map Name'
> - EQUALITY caseExactIA5Match
> - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
> - X-ORIGIN 'RFC 2307bis' )
> -add:attributeTypes:
> - ( 1.3.6.1.1.1.1.32 NAME 'automountKey'
> - DESC 'Automount Key value'
> - EQUALITY caseExactIA5Match
> - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
> - X-ORIGIN 'RFC 2307bis' )
> -add:attributeTypes:
> - ( 1.3.6.1.1.1.1.33 NAME 'automountInformation'
> - DESC 'Automount information'
> - EQUALITY caseExactIA5Match
> - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
> - X-ORIGIN 'RFC 2307bis' )
> -add:objectClasses:
> - ( 1.3.6.1.1.1.2.16 NAME 'automountMap'
> - DESC 'Automount Map information' SUP top
> - STRUCTURAL MUST automountMapName MAY description
> - X-ORIGIN 'RFC 2307bis' )
> -add:objectClasses:
> - ( 1.3.6.1.1.1.2.17 NAME 'automount'
> - DESC 'Automount information' SUP top STRUCTURAL
> - MUST ( automountKey $ automountInformation ) MAY description
> - X-ORIGIN 'RFC 2307bis' )
> -
> -# Add the default automount entries
> -
> -dn: cn=automount,$SUFFIX
> -add:objectClass: nsContainer
> -add:cn: automount
> -
> -dn: automountmapname=auto.master,cn=automount,$SUFFIX
> -add:objectClass: automountMap
> -add:automountMapName: auto.master
> -
> -dn: automountkey=/-,automountmapname=auto.master,cn=automount,$SUFFIX
> -add:objectClass: automount
> -add:automountKey: '/-'
> -add:automountInformation: auto.direct
> -
> -dn: automountmapname=auto.direct,cn=automount,$SUFFIX
> -add:objectClass: automountMap
> -add:automountMapName: auto.direct
> diff --git a/ipaserver/updates/groupofhosts.update b/ipaserver/updates/groupofhosts.update
> deleted file mode 100644
> index fb39c5e..0000000
> --- a/ipaserver/updates/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/ipaserver/updates/host.update b/ipaserver/updates/host.update
> deleted file mode 100644
> index f5ecda5..0000000
> --- a/ipaserver/updates/host.update
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -#
> -# Schema for IPA Hosts
> -#
> -dn: cn=schema
> -add: attributeTypes:
> - ( 2.16.840.1.113730.3.8.3.10 NAME 'ipaClientVersion'
> - DESC 'Text string describing client version of the IPA software installed'
> - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
> - X-ORIGIN 'IPA v2' )
> -
> -add: attributeTypes:
> - ( 2.16.840.1.113730.3.8.3.11 NAME 'enrolledBy'
> - DESC 'DN of administrator who performed manual enrollment of the host'
> - SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
> - X-ORIGIN 'IPA v2' )
> -add: objectClasses:
> - ( 2.16.840.1.113730.3.8.4.2 NAME 'ipaHost'
> - AUXILIARY
> - MAY ( userPassword $ ipaClientVersion $ enrolledBy)
> - X-ORIGIN 'IPA v2' )
> -add: objectClasses:
> - ( 2.5.6.21 NAME 'pkiUser'
> - SUP top AUXILIARY
> - MAY ( userCertificate )
> - X-ORIGIN 'RFC 2587' )
> _______________________________________________
> Freeipa-devel mailing list
> Freeipa-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/freeipa-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20090206/7ba538c2/attachment.sig>
More information about the Freeipa-devel
mailing list