Merge branch 'master' of git://fedorapeople.org/~jderose/freeipa2

3 files changed, 84 insertions, 0 deletions

diff --git a/ipaserver/updates/automount.update b/ipaserver/updates/automount.update
new file mode 100644
index 00000000..13d9a6df
--- /dev/null
+++ b/ipaserver/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/ipaserver/updates/groupofhosts.update b/ipaserver/updates/groupofhosts.update
new file mode 100644
index 00000000..fb39c5e2
--- /dev/null
+++ b/ipaserver/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/ipaserver/updates/host.update b/ipaserver/updates/host.update
new file mode 100644
index 00000000..f5ecda5a
--- /dev/null
+++ b/ipaserver/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' )