Index: package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi	(revision 2729)
+++ package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi	(revision 2729)
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+"""Main FastCGI entry point for authenticated web interface"""
+
+import cherrypy
+import os
+import sys
+from main import InvirtWeb
+
+dev = False
+base_dir = os.path.dirname(__file__)
+
+def usage():
+    print >>sys.stderr, """%s [config]
+
+Run server as FastCGI, with CherryPy config from "main.conf".
+
+With `config`, run standalone with CherryPy config from `config`.
+""" % sys.argv[0]
+    sys.exit(2)
+
+if __name__ == "__main__":
+    static_dir = os.path.join(base_dir, 'static')
+
+    if len(sys.argv) > 2:
+        usage()
+    if len(sys.argv) > 1:
+        if sys.argv[1] in ('-h', '--help'):
+            usage()
+        conf_file = sys.argv[1]
+        dev = True
+    else:
+        conf_file = os.path.join(base_dir, 'main.conf')
+
+    app_config = {
+        '/': {
+            'tools.invirtwebstate.on': True,
+            },
+        '/static': {
+            'tools.staticdir.root': static_dir,
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir': static_dir,
+            }
+        }
+                    
+    app = cherrypy.tree.mount(InvirtWeb(),
+                              '/',
+                              app_config)
+    app.merge(conf_file)
+    cherrypy.config.update(conf_file)
+
+    if dev:
+        cherrypy.server.quickstart()
+        cherrypy.engine.start()
+        cherrypy.engine.block()
+    else:
+        cherrypy.engine.start(blocking=False)
+        from flup.server.fcgi import WSGIServer
+        server = WSGIServer(cherrypy.tree)
+        server.run()
Index: package_branches/invirt-web/cherrypy-rebased/code/main.fcgi
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/main.fcgi	(revision 2728)
+++ 	(revision )
@@ -1,63 +1,0 @@
-#!/usr/bin/python
-"""Main FastCGI entry point for web interface"""
-
-import cherrypy
-import os
-import sys
-from main import InvirtWeb, InvirtUnauthWeb
-
-dev = False
-base_dir = os.path.dirname(__file__)
-
-def usage():
-    print >>sys.stderr, """%s [config]
-
-Run server as FastCGI, with CherryPy config from "main.conf".
-
-With `config`, run standalone with CherryPy config from `config`.
-""" % sys.argv[0]
-    sys.exit(2)
-
-if __name__ == "__main__":
-    static_dir = os.path.join(base_dir, 'static')
-
-    if len(sys.argv) > 2:
-        usage()
-    if len(sys.argv) > 1:
-        if sys.argv[1] in ('-h', '--help'):
-            usage()
-        conf_file = sys.argv[1]
-        dev = True
-    else:
-        conf_file = os.path.join(base_dir, 'main.conf')
-
-    app_config = {
-        '/': {
-            'tools.invirtwebstate.on': True,
-            },
-        '/static': {
-            'tools.staticdir.root': static_dir,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': static_dir,
-            }
-        }
-                    
-    authApp = cherrypy.tree.mount(InvirtWeb(),
-                                  '/auth',
-                                  app_config)
-    authApp.merge(conf_file)
-    unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
-                                    '/unauth',
-                                    app_config)
-    unauthApp.merge(conf_file)
-    cherrypy.config.update(conf_file)
-
-    if dev:
-        cherrypy.server.quickstart()
-        cherrypy.engine.start()
-        cherrypy.engine.block()
-    else:
-        cherrypy.engine.start(blocking=False)
-        from flup.server.fcgi import WSGIServer
-        server = WSGIServer(cherrypy.tree)
-        server.run()
Index: package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi	(revision 2729)
+++ package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi	(revision 2729)
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+"""Main FastCGI entry point for unauthenticated web interface"""
+
+import cherrypy
+import os
+import sys
+from main import InvirtUnauthWeb
+
+dev = False
+base_dir = os.path.dirname(__file__)
+
+def usage():
+    print >>sys.stderr, """%s [config]
+
+Run server as FastCGI, with CherryPy config from "main.conf".
+
+With `config`, run standalone with CherryPy config from `config`.
+""" % sys.argv[0]
+    sys.exit(2)
+
+if __name__ == "__main__":
+    static_dir = os.path.join(base_dir, 'static')
+
+    if len(sys.argv) > 2:
+        usage()
+    if len(sys.argv) > 1:
+        if sys.argv[1] in ('-h', '--help'):
+            usage()
+        conf_file = sys.argv[1]
+        dev = True
+    else:
+        conf_file = os.path.join(base_dir, 'main.conf')
+
+    app_config = {
+        '/': {
+            'tools.invirtwebstate.on': True,
+            },
+        '/static': {
+            'tools.staticdir.root': static_dir,
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir': static_dir,
+            }
+        }
+                    
+    app = cherrypy.tree.mount(InvirtUnauthWeb(),
+                              '/',
+                              app_config)
+    app.merge(conf_file)
+    cherrypy.config.update(conf_file)
+
+    if dev:
+        cherrypy.server.quickstart()
+        cherrypy.engine.start()
+        cherrypy.engine.block()
+    else:
+        cherrypy.engine.start(blocking=False)
+        from flup.server.fcgi import WSGIServer
+        server = WSGIServer(cherrypy.tree)
+        server.run()
Index: package_branches/invirt-web/cherrypy-rebased/files/etc/apache2/sites-available/default.mako
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/files/etc/apache2/sites-available/default.mako	(revision 2728)
+++ package_branches/invirt-web/cherrypy-rebased/files/etc/apache2/sites-available/default.mako	(revision 2729)
@@ -24,5 +24,5 @@
 	RewriteRule ^/invirt - [L]
 	RewriteRule ^/kill.cgi - [L]
-	RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/unauth/$1 [L]
+	RewriteRule ^/(.*) /var/www/invirt-web/unauth.fcgi/$1 [L]
 
 	ErrorLog /var/log/apache2/error.log
Index: package_branches/invirt-web/cherrypy-rebased/files/etc/apache2/sites-available/ssl.mako
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/files/etc/apache2/sites-available/ssl.mako	(revision 2728)
+++ package_branches/invirt-web/cherrypy-rebased/files/etc/apache2/sites-available/ssl.mako	(revision 2729)
@@ -27,5 +27,5 @@
 	RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
 	RewriteRule ^/kill.cgi - [L]
-	RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/auth/$1 [L]
+	RewriteRule ^/(.*) /var/www/invirt-web/auth.fcgi/$1 [L]
 
 	RewriteLog /var/log/apache2/rewrite.log