Host keys

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index 52d18e4..b9611cd 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -16,7 +16,7 @@ with username '__LOGIN__'.  The password for this account can be found
 encrypted with your PGP or GPG key and appended to this message. A list 
 of machines available to Debian developers can be found at
 <URL:http://db.debian.org/machines.cgi>. Please take a minute now to
-familiarise yourself with the Debian Machine Usage Policy, available
+familiarize yourself with the Debian Machine Usage Policy, available
 at <URL:http://www.debian.org/devel/dmup>
 
 You have been subscribed to the debian-private mailing list as
@@ -72,7 +72,7 @@ crypto laws which go to non-us.debian.org) eventually. master.debian.org is
 the home of our bug tracking system. Project web pages and CVS archives are 
 hosted on klecker.debian.org (aka cvs/www.debian.org), klecker is also our
 general shell server. Web pages should be placed in public_html on klecker 
-and referred to by http://people.debian.org/~__LOGIN__
+and refered to by http://people.debian.org/~__LOGIN__
 
 You should use ssh to log into the machines instead of regular telnet
 or rlogin. Our LDAP directory is able to share ssh RSA keys among machines,

diff --git a/ud-host b/ud-host
index a2e8708..d0fe689 100755 (executable)
--- a/ud-host
+++ b/ud-host
@@ -26,7 +26,9 @@ AttrInfo = {"description": ["Machine Descr.", 1],
             "machine": ["Machine Hardware", 10],
             "memory": ["Memory", 11],
             "disk": ["Disk", 12],
-            "bandwidth": ["Bandwidth", 13]};
+            "sshrsahostkey": ["SSH RSA", 14],
+            "sshdsahostkey": ["SSH DSA", 15],
+            "bandwidth": ["Bandwidth", 16]};
 
 AttrPrompt = {"description": ["Purpose of the machine"],
               "hostname": ["The hostnames for the box (ipv4/ipv6)"],
@@ -40,6 +42,8 @@ AttrPrompt = {"description": ["Purpose of the machine"],
               "machine": ["Hardware description"],
               "memory": ["Installed RAM"],
               "disk": ["Disk Space, RAID levels, etc"],
+             "sshrsahostkey": ["A copy of /etc/ssh/ssh_host_key.pub"],
+             "sshdsahostkey": ["A copy of /etc/ssh/ssh_host_key.pub.dsa"],
               "bandwidth": ["Available outbound"]};
 
 # Create a map of IDs to desc,value,attr