Index: /package_branches/invirt-web/cherrypy/code/main.fcgi
===================================================================
--- /package_branches/invirt-web/cherrypy/code/main.fcgi (revision 2483)
+++ /package_branches/invirt-web/cherrypy/code/main.fcgi (revision 2484)
@@ -5,5 +5,5 @@
import os
import sys
-from main import InvirtWeb
+from main import InvirtWeb, InvirtUnauthWeb
dev = False
@@ -26,4 +26,8 @@
})
app.merge(conf_file)
+ unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
+ '/unauth',
+ {'/': {'tools.invirtwebstate.on': True}})
+ unauthApp.merge(conf_file)
cherrypy.config.update(conf_file)
@@ -35,4 +39,4 @@
cherrypy.engine.start(blocking=False)
from flup.server.fcgi import WSGIServer
- server = WSGIServer(app)
+ server = WSGIServer(cherrypy.tree)
server.run()
Index: /package_branches/invirt-web/cherrypy/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy/code/main.py (revision 2483)
+++ /package_branches/invirt-web/cherrypy/code/main.py (revision 2484)
@@ -53,4 +53,10 @@
from view import View
import ajaxterm
+
+class InvirtUnauthWeb(View):
+ @cherrypy.expose
+ @cherrypy.tools.mako(filename="/unauth.mako")
+ def index(self):
+ return {'simple': True}
class InvirtWeb(View):
@@ -710,11 +716,5 @@
return d
-def unauthFront(_, _2, _3, fields):
- """Information for unauth'd users."""
- return templates.unauth(searchList=[{'simple' : True,
- 'hostname' : socket.getfqdn()}])
-
-mapping = dict(
- unauth=unauthFront)
+mapping = dict()
def printHeaders(headers):
Index: /package_branches/invirt-web/cherrypy/code/templates/unauth.mako
===================================================================
--- /package_branches/invirt-web/cherrypy/code/templates/unauth.mako (revision 2484)
+++ /package_branches/invirt-web/cherrypy/code/templates/unauth.mako (revision 2484)
@@ -0,0 +1,56 @@
+<%page expression_filter="h"/>
+<%inherit file="skeleton.mako" />
+
+<%def name="title()">
+Intro
+
+
+XVM — Virtual Servers for MIT
+
+xvm.mit.edu is a virtualization service for the
+MIT community. We offer virtual machines—your
+own complete system on which you can start from our three-minute
+Debian or Ubuntu install or install the operating
+system of your choice. The service is free
+to any Athena account holder.
+
+MIT users:
+→ Log in to XVM now
+
+You'll need an MIT personal
+certificate.
+
+XVM features:
+
+- Online management of virtual machines
+- A wide selection of bootable CD-ROM images and installers
+- An automated Debian and Ubuntu installer
+- Secure VNC console access via a Java applet
+- Secure serial console access over SSH
+- Ownership and access control through Athena lockers and groups
+
+
+XVM does not feature:
+
+- backups of VM disk images; images are on a RAID, but you should
+ arrange your own backups for data that is important to you.
+- guarantees of uptime or security; we are a best-effort volunteer
+ service, though we follow security and reliability best practices
+ shared by production SIPB services.
+
+
+The XVM code base is a free software project under
+development, licensed under GPLv2+. If you're interested in using it,
+we'd be happy to help you set it up in your environment. Our Subversion
+repository is
https://xvm.mit.edu:1111/
+
+xvm.mit.edu is provided by SIPB,
+the student computing group at MIT, with generous funding from IS&T. Like all SIPB projects, we
+are independently run by our own team of volunteers, and we welcome new
+contributors.
+
+Questions and feedback welcome at xvm@mit.edu.
Index: ckage_branches/invirt-web/cherrypy/code/templates/unauth.tmpl
===================================================================
--- /package_branches/invirt-web/cherrypy/code/templates/unauth.tmpl (revision 2483)
+++ (revision )
@@ -1,60 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-
-#def title
-Intro
-#end def
-
-#def body
-XVM — Virtual Servers for MIT
-
-xvm.mit.edu is a virtualization service for the
-MIT community. We offer virtual machines—your
-own complete system on which you can start from our three-minute
-Debian or Ubuntu install or install the operating
-system of your choice. The service is free
-to any Athena account holder.
-
-MIT users:
-→ Log in to XVM now
-
-You'll need an MIT personal
-certificate.
-
-XVM features:
-
-- Online management of virtual machines
-- A wide selection of bootable CD-ROM images and installers
-- An automated Debian and Ubuntu installer
-- Secure VNC console access via a Java applet
-- Secure serial console access over SSH
-- Ownership and access control through Athena lockers and groups
-
-
-XVM does not feature:
-
-- backups of VM disk images; images are on a RAID, but you should
- arrange your own backups for data that is important to you.
-- guarantees of uptime or security; we are a best-effort volunteer
- service, though we follow security and reliability best practices
- shared by production SIPB services.
-
-
-The XVM code base is a free software project under
-development, licensed under GPLv2+. If you're interested in using it,
-we'd be happy to help you set it up in your environment. Our Subversion
-repository is
https://xvm.mit.edu:1111/
-
-xvm.mit.edu is provided by SIPB,
-the student computing group at MIT, with generous funding from IS&T. Like all SIPB projects, we
-are independently run by our own team of volunteers, and we welcome new
-contributors.
-
-Questions and feedback welcome at xvm@mit.edu.
-
-#end def