projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
probably break a couple of release dependent templates
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
24e6478
..
e36f484
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-147,7
+147,7
@@
file=/etc/ferm/
file=/etc/ferm/conf.d
file=/etc/ferm/dsa.d
file=/etc/rc.local
file=/etc/ferm/conf.d
file=/etc/ferm/dsa.d
file=/etc/rc.local
-<%
if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'])
%>
+<%
unless lsbdistcodename == 'lenny'
%>
file=/etc/unbound
<% end -%>
file=/etc/dsa
file=/etc/unbound
<% end -%>
file=/etc/dsa
@@
-399,7
+399,7
@@
file=/etc/ferm/conf.d/me.conf
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
-<%
if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'])
%>
+<%
unless lsbdistcodename == 'lenny'
%>
file=/etc/unbound/unbound.conf
<% end -%>
file=/etc/unbound/unbound.conf
<% end -%>