projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
samhainrc: support merged usr layout
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
603e797
..
80a1dc1
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-531,15
+531,24
@@
dir=10/var/lib/puppet/clientbucket
## for these files, only access time is ignored
##
dir=/usr/bin
## for these files, only access time is ignored
##
dir=/usr/bin
+<%- if has_variable?("merged_usr") && @merged_user -%>
+file=/bin
+<% else -%>
dir=/bin
dir=/bin
+<% end -%>
dir=/boot
#
# SuSE (old) has the boot init scripts in /sbin/init.d/*,
# so we go 3 levels deep
#
dir=/boot
#
# SuSE (old) has the boot init scripts in /sbin/init.d/*,
# so we go 3 levels deep
#
+<%- if has_variable?("merged_usr") && @merged_user -%>
+file=/lib
+file=/sbin
+<% else -%>
dir=3/sbin
dir=3/sbin
-dir=/usr/sbin
dir=/lib
dir=/lib
+<% end -%>
+dir=/usr/sbin
dir=3/usr/lib
dir=3/usr/share
#
dir=3/usr/lib
dir=3/usr/share
#