projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the pkglist fact. It's a) unused and b) slightly buggy
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
0faf5ec
..
f6829e6
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-185,7
+185,7
@@
file=/etc/rc.local
file=/etc/unbound
file=/etc/dsa
file=/etc/rabbitmq
file=/etc/unbound
file=/etc/dsa
file=/etc/rabbitmq
-<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or
scope.function_has_role(['static_master'])
-%>
+<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or
classes.include?("roles::static_master")
-%>
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
@@
-266,7
+266,7
@@
dir=-1/srv
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
-<% if
scope.lookupvar('site::nodeinfo')['buildd']
-%>
+<% if
classes.include?('roles::buildd')
-%>
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
file=/etc/sbuild/sbuild.conf
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
file=/etc/sbuild/sbuild.conf