Use the common routine from userdir_ldap.py which asks for the

[mirror/userdir-ldap.git] / ud-host

diff --git a/ud-host b/ud-host
index f969a61..1eb8d76 100755 (executable)
--- a/ud-host
+++ b/ud-host
@@ -37,7 +37,7 @@ AttrPrompt = {"description": ["Purpose of the machine"],
               "distribution": ["The distribution version"],
               "access": ["all, developer only, restricted"],
               "admin": ["Admin email address"],
-              "architecture": ["Debian Arhitecture string"],
+              "architecture": ["Debian Architecture string"],
               "machine": ["Hardware description"],
               "memory": ["Installed RAM"],
               "disk": ["Disk Space, RAID levels, etc"],
@@ -243,9 +243,13 @@ while(1):
       if len(NAttrs) != 0:
          print "Host",NewHost,"already exists.";
          continue;
+      NewHostName = raw_input("Hostname? ");
+      if NewHost == "":
+         continue;
       Dn = "host=" + NewHost + "," + HBaseDn;
-      l.add_s(Dn,[("host",NewHost),
-                  ("objectclass","top")]);
+      l.add_s(Dn,[("host", NewHost),
+                  ("hostname", NewHostName),
+                  ("objectClass", ("top", "debianServer"))]);
 
       # Switch
       NAttrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);