using mako-render instead of mako; fixed a typo in svn.mako

svn path=/trunk/packages/sipb-xen-www/; revision=886

diff --git a/debian/control b/debian/control
index 13f1a1c..dbc37b1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sipb-xen-www
 Section: base
 Priority: extra
 Maintainer: SIPB Xen Project <sipb-xen@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), subversion, sipb-xen-base
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), subversion
 Standards-Version: 3.7.2
 
 Package: sipb-xen-www

diff --git a/debian/sipb-xen-www.init b/debian/sipb-xen-www.init
index e907f53..2edb8ca 100755 (executable)
--- a/debian/sipb-xen-www.init
+++ b/debian/sipb-xen-www.init
@@ -15,7 +15,9 @@ PACKAGE=sipb-xen-www
 
 gen_config()
 {
-    mako /etc/apache2/sites-available/{ssl,svn}.mako
+  for i in /etc/apache2/sites-available/{ssl,svn}
+  do mako-render $i.mako > $i
+  done
 }
 
 case "$1" in

diff --git a/files/etc/apache2/sites-available/svn.mako b/files/etc/apache2/sites-available/svn.mako
index 1266338..6bc9ad5 100644 (file)
--- a/files/etc/apache2/sites-available/svn.mako
+++ b/files/etc/apache2/sites-available/svn.mako
@@ -6,7 +6,7 @@ svnpath  = cfg.svn.repopath
 %>
 
 <VirtualHost *:1111>
-       ServerAdmin ${errormail}
+       ServerAdmin ${errmail}
        ServerName ${hostname}:1111
        
        <Directory />