Changeset 2730 for package_branches

Timestamp:

Dec 20, 2009, 9:48:10 PM (15 years ago)

Author:

broder

Message:

Setup hosting for static resources in the InvirtWeb? and
InvirtUnauthWeb? classes, instead of in the fcgi configuration.

Location:

package_branches/invirt-web/cherrypy-rebased/code

Files:

• auth.fcgi (modified) (1 diff)
• main.py (modified) (3 diffs)
• unauth.fcgi (modified) (1 diff)

package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi

@@ -36 +36 @@
             'tools.invirtwebstate.on': True,
             },
-        '/static': {
-            'tools.staticdir.root': static_dir,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': static_dir,
-            }
         }
                     

package_branches/invirt-web/cherrypy-rebased/code/main.py

@@ -7 +7 @@
 import datetime
 import hmac
+import os
 import random
 import sha
@@ -38 +39 @@
 from view import View, revertStandardError
 
+
+static_dir = os.path.join(os.path.dirname(__file__), 'static')
+InvirtStatic = cherrypy.tools.staticdir.handler(
+    root=static_dir,
+    dir=static_dir,
+    section='/static')
+
 class InvirtUnauthWeb(View):
+    static = InvirtStatic
+
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/unauth.mako")
@@ -53 +63 @@
                                                  'from invirt import database']
         self._cp_config['request.error_response'] = self.handle_error
+
+    static = InvirtStatic
 
     @cherrypy.expose

package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi

@@ -36 +36 @@
             'tools.invirtwebstate.on': True,
             },
-        '/static': {
-            'tools.staticdir.root': static_dir,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': static_dir,
-            }
         }