Changeset 2737 for trunk/packages/invirt-web/files/etc

Timestamp:

Dec 20, 2009, 11:27:10 PM (15 years ago)

Author:

broder

Message:

Merge cherrypy-rebased branch of invirt-web into trunk.

Location:

trunk/packages/invirt-web

Files:

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

trunk/packages/invirt-web/files/etc/apache2/sites-available/default.mako

@@ -23 +23 @@
         RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
         RewriteRule ^/invirt - [L]
-        RewriteRule ^/sipb-xen(.*) /invirt$1 [PT]
         RewriteRule ^/kill.cgi - [L]
-        RewriteRule ^/~ - [L]
-        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
+        RewriteRule ^/(.*) /var/www/invirt-web/unauth.fcgi/$1 [L]
 
         ErrorLog /var/log/apache2/error.log

trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako

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