Changeset 2650 for package_branches/invirt-web/cherrypy

Timestamp:

Dec 20, 2009, 4:03:12 PM (15 years ago)

Author:

broder

Message:

Fix the unauthenticated web interface.

Separate the separate components of the web app by the authenticated
webapp class at /auth and the unauthenticated app at /unauth.

These are purely internal URLs, but used to allow a single CherryPy?
instance to serve both the authenticated and unauthenticated website.

Location:

package_branches/invirt-web/cherrypy

Files:

• code/main.fcgi (modified) (1 diff)
• files/etc/apache2/sites-available/default.mako (modified) (1 diff)
• files/etc/apache2/sites-available/ssl.mako (modified) (1 diff)

package_branches/invirt-web/cherrypy/code/main.fcgi

@@ -31 +31 @@
     else:
         conf_file = os.path.join(base_dir, 'main.conf')
-    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)
+
+    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',
-                                    {'/': {'tools.invirtwebstate.on': True}})
+                                    app_config)
     unauthApp.merge(conf_file)
     cherrypy.config.update(conf_file)

package_branches/invirt-web/cherrypy/files/etc/apache2/sites-available/default.mako

@@ -24 +24 @@
         RewriteRule ^/invirt - [L]
         RewriteRule ^/kill.cgi - [L]
-        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
+        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/unauth/$1 [L]
 
         ErrorLog /var/log/apache2/error.log

package_branches/invirt-web/cherrypy/files/etc/apache2/sites-available/ssl.mako

@@ -27 +27 @@
         RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
         RewriteRule ^/kill.cgi - [L]
-        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
+        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/auth/$1 [L]
 
         RewriteLog /var/log/apache2/rewrite.log