Set the trac URL to redirect off-site

svn path=/trunk/packages/invirt-web/; revision=1669

diff --git a/debian/changelog b/debian/changelog
index e11effc..77e8135 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.0.9) unstable; urgency=low
+
+  * Move trac off-site - redirect somewhere else
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:12:57 -0500
+
 invirt-web (0.0.8) unstable; urgency=low
 
   * Don't depend on invirt-mail-config

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index f55dea7..1846c0c 100644 (file)
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -1,6 +1,13 @@
+<%
+from invirt.config import structs as cfg
+hostname = cfg.web.hostname
+errmail  = cfg.web.errormail
+tracuri  = cfg.trac.uri
+%>
 NameVirtualHost *:80
 <VirtualHost *:80>
-       ServerAdmin webmaster@localhost
+       ServerAdmin ${errmail}
+        ServerName ${hostname}:80
        
        DocumentRoot /var/www/invirt-web
        <Directory /var/www/invirt-web>
@@ -13,24 +20,13 @@ NameVirtualHost *:80
        RewriteEngine On
        RewriteRule ^/static(.*) - [L]
        RewriteRule ^/admin/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 ^/trac(.*) ${trac.uri}$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]
 
-       ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-       <Directory "/usr/lib/cgi-bin">
-               AllowOverride None
-               Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-               Order allow,deny
-               Allow from all
-       </Directory>
-
        ErrorLog /var/log/apache2/error.log
 
        # Possible values include: debug, info, notice, warn, error, crit,

diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako
index b722bfd..6f46666 100644 (file)
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -24,11 +24,7 @@ ${caller.body()}
        RewriteRule ^/static(.*) - [L]
        RewriteRule ^/overlord/static(.*) /static/$1 [L]
        RewriteRule ^/admin/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 ^/trac(.*) ${trac.uri}$1 [R,L]
        RewriteRule ^/kill.cgi - [L]
        RewriteRule ^/~ - [L]
        RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]