Apache config to allow that front page

Review of this patch is particularly welcome, since I don't
actually know entirely what I'm doing.

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

diff --git a/debian/changelog b/debian/changelog
index 14b7db9..c22ee41 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 sipb-xen-www (3.2) unstable; urgency=low
 
   * Check in (part of?) the Apache config.
+  * Modify it to allow an informative front page without certs.
+  * Add that front page.
 
- -- Greg Price <price@mit.edu>  Fri,  9 May 2008 00:03:08 -0400
+ -- Greg Price <price@mit.edu>  Fri,  9 May 2008 02:11:04 -0400
 
 sipb-xen-www (3.1) unstable; urgency=low
 

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index dc99744..7f01f05 100644 (file)
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -2,8 +2,8 @@ NameVirtualHost *:80
 <VirtualHost *:80>
        ServerAdmin webmaster@localhost
        
-       DocumentRoot /var/www/
-       <Directory /var/www/>
+       DocumentRoot /var/www/sipb-xen-www
+       <Directory /var/www/sipb-xen-www>
                Options Indexes FollowSymLinks MultiViews ExecCGI
                AllowOverride None
                Order allow,deny
@@ -16,13 +16,13 @@ NameVirtualHost *:80
        </Directory>
 
        RewriteEngine On
-       #RewriteRule ^/trac - [L]
+       RewriteRule ^/static(.*) - [L]
         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
        RewriteRule ^/trac/login(.*) https://sipb-xen-dev.mit.edu/trac/login$1 [L]
         RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
        RewriteRule ^/sipb-xen - [L]
-       RewriteRule ^(.*) https://sipb-xen-dev.mit.edu$1
+       RewriteRule ^/(.*) /var/www/sipb-xen-www/main.py/$1 [L]
 
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
        <Directory "/usr/lib/cgi-bin">