From 6dde26115bb18b34a5c0dcbf885f585f67e3060e Mon Sep 17 00:00:00 2001
From: Yang Zhang <y_z@mit.edu>
Date: Thu, 14 Aug 2008 15:15:38 -0400
Subject: [PATCH] generate config files using mako
svn path=/trunk/packages/sipb-xen-console-server/; revision=889
---
debian/changelog | 6 ++++++
debian/sipb-xen-console-server.init | 11 +++--------
files/etc/conserver/invirt-genconfig.cf.mako | 6 ++++++
3 files changed, 15 insertions(+), 8 deletions(-)
create mode 100644 files/etc/conserver/invirt-genconfig.cf.mako
diff --git a/debian/changelog b/debian/changelog
index 760d0e3..4819606 100644
--- 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
--- 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
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 *;
+}
--
1.7.9.5