From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 28 Aug 2019 10:07:00 +0000 (+0200)
Subject: samhainrc: support merged usr layout
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a1b5a1c81f41292d5a21f4e8762aa0ae9d360679;hp=549a587c21c0558160230268202b0f16d7551f9f;p=mirror%2Fdsa-puppet.git

samhainrc: support merged usr layout
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 603e797ae..80a1dc144 100644
--- 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
+<%- if has_variable?("merged_usr") && @merged_user -%>
+file=/bin
+<% else -%>
 dir=/bin
+<% end -%>
 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=/usr/sbin
 dir=/lib
+<% end -%>
+dir=/usr/sbin
 dir=3/usr/lib
 dir=3/usr/share
 #