generate config files using mako

svn path=/trunk/packages/sipb-xen-console-server/; revision=889

diff --git a/debian/changelog b/debian/changelog
index 760d0e3..4819606 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-console-server (2.06) unstable; urgency=low
+
+  * generate config files using mako
+
+ -- Yang Zhang <y_z@mit.edu>  Thu, 14 Aug 2008 15:15:18 -0400
+
 sipb-xen-console-server (2.05) unstable; urgency=low
 
   * use invirt.config rather than /etc/invirt/* directly

diff --git a/debian/sipb-xen-console-server.init b/debian/sipb-xen-console-server.init
index 97eac71..2b8a116 100755 (executable)
--- a/debian/sipb-xen-console-server.init
+++ b/debian/sipb-xen-console-server.init
@@ -31,14 +31,9 @@ SCRIPTNAME=/etc/init.d/$NAME
 
 gen_config()
 {
-        console_ip=$(invirt-getconf console.ip)
-        cat >/etc/conserver/invirt-genconfig.cf <<EOF
-access * {
-       trusted 127.0.0.1;
-       trusted $console_ip;
-       limited *;
-}
-EOF
+        for i in /etc/conserver/invirt-genconfig.cf
+        do mako-render $i.mako > $i
+        done
 }
 
 #

diff --git a/files/etc/conserver/invirt-genconfig.cf.mako b/files/etc/conserver/invirt-genconfig.cf.mako
new file mode 100644 (file)
index 0000000..94c3f94
--- /dev/null
+++ b/files/etc/conserver/invirt-genconfig.cf.mako
@@ -0,0 +1,6 @@
+<% from invirt.config import structs as cfg %>\
+access * {
+       trusted 127.0.0.1;
+       trusted ${cfg.console.ip};
+       limited *;
+}