Fix munin-config to work if no monitoring hosts are configured.

svn path=/trunk/packages/xvm-munin-config/; revision=2965

diff --git a/debian/changelog b/debian/changelog
index 0c0222c..c2b1ee7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xvm-munin-config (0.0.10) unstable; urgency=low
+
+  * Make the munin-node.conf Mako template render even if no monitoring
+    hosts are configured.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 28 Jan 2010 00:11:14 -0500
+

 xvm-munin-config (0.0.9) unstable; urgency=low
 
   * Added a clean target.
 xvm-munin-config (0.0.9) unstable; urgency=low
 
   * Added a clean target.

diff --git a/debian/transform_munin-node.conf.xvm.mako b/debian/transform_munin-node.conf.xvm.mako
index 2572e76..a6955df 100755 (executable)
--- a/debian/transform_munin-node.conf.xvm.mako
+++ b/debian/transform_munin-node.conf.xvm.mako
@@ -19,7 +19,7 @@ print unless /^$/;
 
 END {
   print <<'EOF';
 
 END {
   print <<'EOF';

-% for host in cfg.monitoring:
+% for host in cfg.get('monitoring', []):

 allow ^${host.ip.replace('.', '\.')}$
 % endfor
 EOF
 allow ^${host.ip.replace('.', '\.')}$
 % endfor
 EOF