From: Stephen Gran <steve@lobefin.net>
Date: Wed, 30 Dec 2009 17:52:26 +0000 (+0000)
Subject: try a different template construct
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=893e6591772f6e794844f0184b294032acd36544;p=dsa-puppet.git

try a different template construct

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6aafaf36..3b1c6c3a 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -75,11 +75,10 @@
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
-<% case hoster
-   when "ubcece", "darmstadt", "ftcollins" then ""
-   else "file=/etc/resolv.conf
-"
-end -%>
+<% case hoster when "ubcece", "darmstadt", "ftcollins" then ""
+else -%>
+file=/etc/resolv.conf
+<% end -%>
 file=/etc/localtime
 file=/etc/ioctl.save
 file=/etc/passwd.backup
@@ -209,10 +208,9 @@ file=/var/log/syslog
 ##
 ## This file might be created or removed by the system sometimes.
 ##
-<% case hoster
-   when "ubcece", "darmstadt", "ftcollins" then "file=/etc/resolv.conf
-"
-   else ""
+<% case hoster when "ubcece", "darmstadt", "ftcollins" then "" -%>
+file=/etc/resolv.conf
+<% else
 end -%>
 file=/etc/resolv.conf.pcmcia.save
 file=/etc/nologin