Changeset 2651

Timestamp:

Dec 20, 2009, 5:20:19 PM (15 years ago)

Author:

broder

Message:

Use separate fcgi files for the authed and unauthed site.

This allows both of them to be mounted on / in their respective
CherryPy? apps, which in turn eliminates any discrepancy between
"internal URLs" and "external URLs".

Location:

package_branches/invirt-web/cherrypy

Files:

• code/auth.fcgi (moved) (moved from package_branches/invirt-web/cherrypy/code/main.fcgi) (2 diffs)
• code/unauth.fcgi (copied) (copied from package_branches/invirt-web/cherrypy/code/main.fcgi) (2 diffs)
• 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/auth.fcgi

@@ -1 +1 @@
 #!/usr/bin/python
-"""Main FastCGI entry point for web interface"""
+"""Main FastCGI entry point for authenticated web interface"""
 
 import cherrypy
 import os
 import sys
-from main import InvirtWeb, InvirtUnauthWeb
+from main import InvirtWeb
 
 dev = False
@@ -43 +43 @@
         }
                     
-    authApp = cherrypy.tree.mount(InvirtWeb(),
-                                  '/auth',
-                                  app_config)
-    authApp.merge(conf_file)
-    unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
-                                    '/unauth',
-                                    app_config)
-    unauthApp.merge(conf_file)
+    app = cherrypy.tree.mount(InvirtWeb(),
+                              '/',
+                              app_config)
+    app.merge(conf_file)
     cherrypy.config.update(conf_file)
 

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

@@ -1 +1 @@
 #!/usr/bin/python
-"""Main FastCGI entry point for web interface"""
+"""Main FastCGI entry point for unauthenticated web interface"""
 
 import cherrypy
 import os
 import sys
-from main import InvirtWeb, InvirtUnauthWeb
+from main import InvirtUnauthWeb
 
 dev = False
@@ -43 +43 @@
         }
                     
-    authApp = cherrypy.tree.mount(InvirtWeb(),
-                                  '/auth',
-                                  app_config)
-    authApp.merge(conf_file)
-    unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
-                                    '/unauth',
-                                    app_config)
-    unauthApp.merge(conf_file)
+    app = cherrypy.tree.mount(InvirtUnauthWeb(),
+                              '/',
+                              app_config)
+    app.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/unauth/$1 [L]
+        RewriteRule ^/(.*) /var/www/invirt-web/unauth.fcgi/$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/auth/$1 [L]
+        RewriteRule ^/(.*) /var/www/invirt-web/auth.fcgi/$1 [L]
 
         RewriteLog /var/log/apache2/rewrite.log