Changeset 1669

Timestamp:

Nov 15, 2008, 11:17:56 PM (16 years ago)

Author:

broder

Message:

Set the trac URL to redirect off-site

Location:

trunk/packages/invirt-web

Files:

• debian/changelog (modified) (1 diff)
• files/etc/apache2/sites-available/default (modified) (3 diffs)
• files/etc/apache2/sites-available/ssl.mako (modified) (1 diff)

trunk/packages/invirt-web/debian/changelog

@@ +1 @@
+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
 

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

@@ +1 @@
+<%
+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
@@ -14 +21 @@
         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]
@@ -23 +27 @@
         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

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

@@ -25 +25 @@
         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]