uncommitted changes from xvm.mit.edu:/etc/apache2

svn path=/trunk/packages/sipb-xen-www/; revision=848

diff --git a/debian/changelog b/debian/changelog
index 1baef2b..a68e7b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sipb-xen-www (3.7) unstable; urgency=low
+
+  uncommitted changes in /etc/apache2 on xvm.mit.edu:
+  * rewrite static/ uris for admin mode
+  * allow ~ uris
+
+ -- Greg Price <price@mit.edu>  Sun,  3 Aug 2008 04:11:23 -0400
+
 sipb-xen-www (3.6) unstable; urgency=low
 
   * Add Anders' kstart-using apache2 init script.

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index 847208b..1faf9d8 100644 (file)
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -12,12 +12,14 @@ NameVirtualHost *:80
 
        RewriteEngine On
        RewriteRule ^/static(.*) - [L]
+       RewriteRule ^/overlord/static(.*) /static/$1 [L]
         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
        RewriteRule ^/trac/login(.*) https://xvm.mit.edu/trac/login$1 [L]
         RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
        RewriteRule ^/sipb-xen - [L]
        RewriteRule ^/kill.cgi - [L]
+       RewriteRule ^/~ - [L]
        RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L]
 
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/

diff --git a/files/etc/apache2/sites-available/ssl b/files/etc/apache2/sites-available/ssl
index 7057f20..901d6d6 100644 (file)
--- a/files/etc/apache2/sites-available/ssl
+++ b/files/etc/apache2/sites-available/ssl
@@ -19,12 +19,14 @@
        RewriteEngine On
        RewriteRule ^/favicon.ico - [L]
        RewriteRule ^/static(.*) - [L]
+       RewriteRule ^/overlord/static(.*) /static/$1 [L]
        RewriteRule ^/trac.fcgi(.*) - [L]
        RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
        RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
        RewriteRule ^/var(.*) - [L]
        RewriteRule ^/wiki(.*) - [L]
        RewriteRule ^/kill.cgi - [L]
+       RewriteRule ^/~ - [L]
        RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L]
 
        RewriteLog /var/log/apache2/rewrite.log