From ea13500e6d3103252a8531e65cddb58d5b2e3c15 Mon Sep 17 00:00:00 2001
From: Marc 'HE' Brockschmidt <he@debian.org>
Date: Tue, 25 Dec 2007 15:37:29 +0100
Subject: [PATCH] LDAP schema changes and fitting changes to ud-host:  * Add
 "purpose" (multi-value field, should contain stuff like "buildd",   
 "porter", ...)  * Add "physicalHost" (used for virtual system, containing the
 FQDN of    the physical host system)

---
 ud-host             | 10 +++++++---
 userdir-ldap.schema | 24 +++++++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ud-host b/ud-host
index 4ba0571..3490e6d 100755
--- a/ud-host
+++ b/ud-host
@@ -50,8 +50,10 @@ AttrInfo = {"description": ["Machine Descr.", 1],
             "machine": ["Machine Hardware", 10],
             "memory": ["Memory", 11],
             "disk": ["Disk", 12],
+            "physicalHost": ["Physical Host", 13],
             "sshRSAHostKey": ["SSH Host Keys", 14],
-            "bandwidth": ["Bandwidth", 15]};
+            "bandwidth": ["Bandwidth", 15],
+            "purpose": ["Purposes", 16],};
 
 AttrPrompt = {"description": ["Purpose of the machine"],
               "hostname": ["The hostnames for the box (ipv4/ipv6)"],
@@ -65,8 +67,10 @@ AttrPrompt = {"description": ["Purpose of the machine"],
               "machine": ["Hardware description"],
               "memory": ["Installed RAM"],
               "disk": ["Disk Space, RAID levels, etc"],
+              "physicalHost": ["The box hosting this virtual server"],
 	      "sshRSAHostKey": ["A copy of /etc/ssh/ssh_*host_key.pub"],
-              "bandwidth": ["Available outbound"]};
+              "bandwidth": ["Available outbound"],
+              "purpose": ["The purposes of this host"],};
 
 # Create a map of IDs to desc,value,attr
 OrderedIndex = {};
@@ -128,7 +132,7 @@ def Overview(Attrs):
 
 # Change a single attribute
 def ChangeAttr(Attrs,Attr):
-   if (Attr == "sponsor" or Attr == "sshRSAHostKey"):
+   if (Attr in ["sponsor", "sshRSAHostKey", "purpose"]):
       return MultiChangeAttr(Attrs,Attr);
 
    print "Old value: '%s'" % (GetAttr(Attrs,Attr,""));
diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 32e679f..d089f0b 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -1,7 +1,8 @@
 # Revision history:
 #
-# XXX [PP]
-#   - Now version controlled in db.d.o bzr repository - 2007-12-25
+# XXX
+#   - [PP] Now version controlled in db.d.o bzr repository - 2007-12-25
+#   - [HE] Add 'purpose', 'physicalHost' to debianServer - 2007-12-25
 #
 # 0.7 [RM]
 #   - Add 'gender' and 'birthDate' to debianDeveloper
@@ -93,6 +94,8 @@
 #   .30 - gender
 #   .31 - birthdate
 #   .32 - mailDisableMessage
+#   .33 - purpose
+#   .34 - physicalHost
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -332,6 +335,21 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.32
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.33
+	NAME 'purpose'
+	DESC 'purposes of this server'
+	EQUALITY caseIgnoreMatch
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.34
+	NAME 'physicalHost'
+	DESC 'FQDN of the physical host of this virtual server'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
 # Public object classes
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
@@ -457,7 +475,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
 	MUST ( host $ hostname )
 	MAY ( c $ access $ admin $ architecture $ bandwidth $ description $ disk $
 	      distribution $ l $ machine $ memory $ sponsor $
-	      sponsor-admin $ sshRSAHostKey $ status
+	      sponsor-admin $ sshRSAHostKey $ status $ purpose $ physicalHost
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
-- 
2.20.1