Index: /trunk/packages/invirt-web/debian/changelog
===================================================================
--- /trunk/packages/invirt-web/debian/changelog	(revision 1673)
+++ /trunk/packages/invirt-web/debian/changelog	(revision 1674)
@@ -1,2 +1,9 @@
+invirt-web (0.0.10) unstable; urgency=low
+
+  * Make /etc/apache2/sites-available/default a mako template
+  * Fix a mistyped variable
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:27:56 -0500
+
 invirt-web (0.0.9) unstable; urgency=low
 
Index: /trunk/packages/invirt-web/debian/invirt-web.init
===================================================================
--- /trunk/packages/invirt-web/debian/invirt-web.init	(revision 1673)
+++ /trunk/packages/invirt-web/debian/invirt-web.init	(revision 1674)
@@ -12,5 +12,5 @@
 PACKAGE=invirt-web
 PARENTPACKAGE=apache2
-GEN_FILES=(/etc/apache2/sites-available/{ssl,svn})
+GEN_FILES=(/etc/apache2/sites-available/{default,ssl,svn})
 
 . /lib/init/config-init.sh
Index: unk/packages/invirt-web/files/etc/apache2/sites-available/default
===================================================================
--- /trunk/packages/invirt-web/files/etc/apache2/sites-available/default	(revision 1673)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<%
-from invirt.config import structs as cfg
-hostname = cfg.web.hostname
-errmail  = cfg.web.errormail
-tracuri  = cfg.trac.uri
-%>
-NameVirtualHost *:80
-<VirtualHost *:80>
-	ServerAdmin ${errmail}
-        ServerName ${hostname}:80
-	
-	DocumentRoot /var/www/invirt-web
-	<Directory /var/www/invirt-web>
-		Options Indexes FollowSymLinks MultiViews ExecCGI
-		AllowOverride None
-		Order allow,deny
-		allow from all
-	</Directory>
-
-	RewriteEngine On
-	RewriteRule ^/static(.*) - [L]
-	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
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel notice
-
-	CustomLog /var/log/apache2/access.log combined
-	ServerSignature On
-
-    Alias /doc/ "/usr/share/doc/"
-    <Directory "/usr/share/doc/">
-        Options Indexes MultiViews FollowSymLinks
-        AllowOverride None
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.0/255.0.0.0 ::1/128
-    </Directory>
-
-</VirtualHost>
Index: /trunk/packages/invirt-web/files/etc/apache2/sites-available/default.mako
===================================================================
--- /trunk/packages/invirt-web/files/etc/apache2/sites-available/default.mako	(revision 1674)
+++ /trunk/packages/invirt-web/files/etc/apache2/sites-available/default.mako	(revision 1674)
@@ -0,0 +1,48 @@
+<%
+from invirt.config import structs as cfg
+hostname = cfg.web.hostname
+errmail  = cfg.web.errormail
+tracuri  = cfg.trac.uri
+%>
+NameVirtualHost *:80
+<VirtualHost *:80>
+	ServerAdmin ${errmail}
+        ServerName ${hostname}:80
+	
+	DocumentRoot /var/www/invirt-web
+	<Directory /var/www/invirt-web>
+		Options Indexes FollowSymLinks MultiViews ExecCGI
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	RewriteEngine On
+	RewriteRule ^/static(.*) - [L]
+	RewriteRule ^/admin/static(.*) /static/$1 [L]
+	RewriteRule ^/trac(.*) ${tracuri}$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
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel notice
+
+	CustomLog /var/log/apache2/access.log combined
+	ServerSignature On
+
+    Alias /doc/ "/usr/share/doc/"
+    <Directory "/usr/share/doc/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+    </Directory>
+
+</VirtualHost>
Index: /trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako
===================================================================
--- /trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako	(revision 1673)
+++ /trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako	(revision 1674)
@@ -25,5 +25,5 @@
 	RewriteRule ^/overlord/static(.*) /static/$1 [L]
 	RewriteRule ^/admin/static(.*) /static/$1 [L]
-	RewriteRule ^/trac(.*) ${trac.uri}$1 [R,L]
+	RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
 	RewriteRule ^/kill.cgi - [L]
 	RewriteRule ^/~ - [L]