Use daemon/sipb-xen.mit.edu and don't give user fake auth token in an HTML comment.

Closes #31

svn path=/trunk/web/; revision=216

diff --git a/templates/controls.py b/templates/controls.py
index 5311dd9..1e769b0 100644 (file)
--- a/templates/controls.py
+++ b/templates/controls.py
@@ -23,7 +23,7 @@ def uuidToString(u):
                      "%02x" * 6]) % tuple(u)
 # end stolen code
 
                      "%02x" * 6]) % tuple(u)
 # end stolen code
 

-def kinit(username = 'tabbott/extra', keytab = '/etc/tabbott.keytab'):
+def kinit(username = 'daemon/sipb-xen.mit.edu', keytab = '/etc/sipb-xen.keytab'):

     """Kinit with a given username and keytab"""
 
     p = subprocess.Popen(['kinit', "-k", "-t", keytab, username],
     """Kinit with a given username and keytab"""
 
     p = subprocess.Popen(['kinit', "-k", "-t", keytab, username],

diff --git a/templates/vnc.tmpl b/templates/vnc.tmpl
index 47415fe..0dfa965 100644 (file)
--- a/templates/vnc.tmpl
+++ b/templates/vnc.tmpl
@@ -22,7 +22,7 @@ Console to $machine.name
 <PARAM NAME="AUTHTOKEN" VALUE="$authtoken">
 <PARAM NAME="SocketFactory" VALUE="VNCProxyConnectSocketFactory">
 </APPLET>
 <PARAM NAME="AUTHTOKEN" VALUE="$authtoken">
 <PARAM NAME="SocketFactory" VALUE="VNCProxyConnectSocketFactory">
 </APPLET>

-<!-- 
+#*

 java VncViewer HOST black-mesa PORT 10003 VMNAME tabbott_test AUTHTOKEN quentin SocketFactory VNCProxyConnectSocketFactory
 java VncViewer HOST black-mesa PORT 10003 VMNAME tabbott_test AUTHTOKEN quentin SocketFactory VNCProxyConnectSocketFactory

--->
+*#

 #end def
 #end def