Punt the "moocow" VNC password - it's dumb, and we already have our

own authentication mechanism (that uses real authentication).

This commit cherry-picks r2487.

Except for the part where the entire commit conflicted.

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2696

diff --git a/code/templates/vnc.mako b/code/templates/vnc.mako
index c211a32..867a145 100644 (file)
--- a/code/templates/vnc.mako
+++ b/code/templates/vnc.mako
@@ -15,7 +15,6 @@ Console to ${machine.name}
 <p>See <a href="help?subject=Console" target="_blank">tips</a> about framebuffer and other issues.</p>
 <applet code="VncViewer.class" archive="https://${hostname}:446/static/VncViewer.jar"
         width="100%" height="1000">
 <p>See <a href="help?subject=Console" target="_blank">tips</a> about framebuffer and other issues.</p>
 <applet code="VncViewer.class" archive="https://${hostname}:446/static/VncViewer.jar"
         width="100%" height="1000">

-<param name="PASSWORD" value="moocow">

 <param name="PORT" value="${port}">
 <param name="HOST" value="${hostname}">
 <param name="VMNAME" value="${machine.name}">
 <param name="PORT" value="${port}">
 <param name="HOST" value="${hostname}">
 <param name="VMNAME" value="${machine.name}">

diff --git a/debian/changelog b/debian/changelog
index ae345b0..652ffc6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-invirt-web (0.0.25) unstable; urgency=low
+invirt-web (0.1.0) unstable; urgency=low

 
   * Depend on python-cherrypy3 and python-mako in preparation of migrating the
     web site.
 
   * Depend on python-cherrypy3 and python-mako in preparation of migrating the
     web site.