Punt some RewriteRules for deprecated URLs we no longer use.

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2727

diff --git a/files/etc/apache2/sites-available/default.mako b/files/etc/apache2/sites-available/default.mako
index dcbc191..8ac6fb7 100644 (file)
--- a/files/etc/apache2/sites-available/default.mako
+++ b/files/etc/apache2/sites-available/default.mako
@@ -22,9 +22,7 @@ NameVirtualHost *:80
        RewriteRule ^/admin/static(.*) /static/$1 [L]
        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]
 
        ErrorLog /var/log/apache2/error.log

diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako
index 3ce7e5f..be558e0 100644 (file)
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -26,7 +26,6 @@ ${caller.body()}
        RewriteRule ^/admin/static(.*) /static/$1 [L]
        RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
        RewriteRule ^/kill.cgi - [L]
-       RewriteRule ^/~ - [L]
        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
 
        RewriteLog /var/log/apache2/rewrite.log