X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/0e16120a7b3ae7887089cd1f8fc8d1e9925ebe52..cfc947fcaa22881a028623bba1acc32297718609:/files/etc/apache2/sites-available/default

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index 8a20897..1846c0c 100644
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -1,9 +1,16 @@
+<%
+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/sipb-xen-www
-	<Directory /var/www/sipb-xen-www>
+	DocumentRoot /var/www/invirt-web
+	<Directory /var/www/invirt-web>
 		Options Indexes FollowSymLinks MultiViews ExecCGI
 		AllowOverride None
 		Order allow,deny
@@ -12,20 +19,13 @@ NameVirtualHost *:80
 
 	RewriteEngine On
 	RewriteRule ^/static(.*) - [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 ^/(.*) /var/www/sipb-xen-www/main.py/$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>
+	RewriteRule ^/admin/static(.*) /static/$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]
 
 	ErrorLog /var/log/apache2/error.log