Update the errortest handler for cherrypy

[invirt/packages/invirt-web.git] / code / main.fcgi

diff --git a/code/main.fcgi b/code/main.fcgi
index ac34a64..cd10538 100755 (executable)
--- a/code/main.fcgi
+++ b/code/main.fcgi
@@ -10,12 +10,20 @@ dev = False
 base_dir = os.path.dirname(__file__)
 
 if __name__=="__main__":
 base_dir = os.path.dirname(__file__)
 
 if __name__=="__main__":

+    static_dir = os.path.join(base_dir, 'static')
+

     if len(sys.argv) > 1:
         conf_file = sys.argv[1]
         dev = True
     else:
         conf_file = os.path.join(base_dir, 'main.conf')
     if len(sys.argv) > 1:
         conf_file = sys.argv[1]
         dev = True
     else:
         conf_file = os.path.join(base_dir, 'main.conf')

-    app = cherrypy.tree.mount(InvirtWeb(), '/' if dev else '/main.fcgi')
+    app = cherrypy.tree.mount(InvirtWeb(),
+        '/',
+        {'/':      {'tools.staticdir.root': static_dir,
+                    'tools.invirtwebstate.on': True},
+        '/static': {'tools.staticdir.on': True,
+                    'tools.staticdir.dir': static_dir}
+         })

     app.merge(conf_file)
     cherrypy.config.update(conf_file)
 
     app.merge(conf_file)
     cherrypy.config.update(conf_file)