projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
bbf3e7d
..
b4ff18e
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-134,6
+134,7
@@
file=/etc/bind/zones
file=/etc/spamassassin/sa-update-keys
# These are the directories for the files we handle with puppet
file=/etc/spamassassin/sa-update-keys
# These are the directories for the files we handle with puppet
+file=/etc/apache2/conf.d
file=/etc/samhain
file=/etc/munin
file=/etc/exim4
file=/etc/samhain
file=/etc/munin
file=/etc/exim4
@@
-280,6
+281,7
@@
file=/etc/clamav-unofficial-sigs.dsa.conf
end
out
%>
end
out
%>
+file=/etc/apache2/conf.d/ressource-limits
file=/etc/apt/preferences
file=/etc/apt/sources.list.d/volatile.list
file=/etc/apt/sources.list.d/security.list
file=/etc/apt/preferences
file=/etc/apt/sources.list.d/volatile.list
file=/etc/apt/sources.list.d/security.list