Fix all kinds of problems with that last version of invirt-web

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

diff --git a/debian/changelog b/debian/changelog
index 77e8135..a2c0ada 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
 
   * Move trac off-site - redirect somewhere else

diff --git a/debian/invirt-web.init b/debian/invirt-web.init
index 560eecd..e8524ee 100755 (executable)
--- a/debian/invirt-web.init
+++ b/debian/invirt-web.init
@@ -11,7 +11,7 @@
 
 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
 config_init "$1"

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default.mako
similarity index 96%
rename from files/etc/apache2/sites-available/default
rename to files/etc/apache2/sites-available/default.mako
index 1846c0c..dcbc191 100644 (file)
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default.mako
@@ -20,7 +20,7 @@ NameVirtualHost *:80
        RewriteEngine On
        RewriteRule ^/static(.*) - [L]
        RewriteRule ^/admin/static(.*) /static/$1 [L]
-       RewriteRule ^/trac(.*) ${trac.uri}$1 [R,L]
+       RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
        RewriteRule ^/invirt - [L]
        RewriteRule ^/sipb-xen(.*) /invirt$1 [PT]
        RewriteRule ^/kill.cgi - [L]

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