Index: trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- trunk/packages/sipb-xen-www/code/main.py	(revision 865)
+++ trunk/packages/sipb-xen-www/code/main.py	(revision 866)
@@ -86,4 +86,5 @@
 
 Template.database = database
+Template.config = config
 Template.helppopup = staticmethod(helppopup)
 Template.err = None
Index: trunk/packages/sipb-xen-www/code/templates/info.tmpl
===================================================================
--- trunk/packages/sipb-xen-www/code/templates/info.tmpl	(revision 865)
+++ trunk/packages/sipb-xen-www/code/templates/info.tmpl	(revision 866)
@@ -88,5 +88,5 @@
 #end filter
 #if not $on
-    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr>
+    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td></tr>
 #filter None
 $errorRow('name', $err)
Index: trunk/packages/sipb-xen-www/code/templates/list.tmpl
===================================================================
--- trunk/packages/sipb-xen-www/code/templates/list.tmpl	(revision 865)
+++ trunk/packages/sipb-xen-www/code/templates/list.tmpl	(revision 866)
@@ -26,5 +26,5 @@
 	<tr>
 	  <td>Name</td>
-	  <td><input type="text" name="name" value="$defaults.name"/>.xvm.mit.edu</td>
+	  <td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td>
 	</tr>
 #filter None
