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
/
files
/
per-host
/
handel.debian.org
/
samhainrc
diff --git
a/modules/samhain/files/per-host/handel.debian.org/samhainrc
b/modules/samhain/files/per-host/handel.debian.org/samhainrc
index
fa6a466
..
bd3503f
100644
(file)
--- a/
modules/samhain/files/per-host/handel.debian.org/samhainrc
+++ b/
modules/samhain/files/per-host/handel.debian.org/samhainrc
@@
-109,7
+109,6
@@
file=/etc/exim4/ssl
file=/etc/apt
file=/etc/apt/apt.conf.d
file=/etc/apt/sources.list.d
file=/etc/apt
file=/etc/apt/apt.conf.d
file=/etc/apt/sources.list.d
-file=/etc/puppet
file=/etc/default
file=/etc/logrotate.d
file=/etc/nagios
file=/etc/default
file=/etc/logrotate.d
file=/etc/nagios
@@
-119,6
+118,7
@@
file=/usr/lib/nagios/plugins
file=/usr/sbin
file=/etc/monit
file=/etc/monit/monit.d
file=/usr/sbin
file=/etc/monit
file=/etc/monit/monit.d
+file=/etc/pam.d
[LogFiles]
##
[LogFiles]
##
@@
-193,6
+193,7
@@
file=/etc/postfix/debianhosts.db
# We handle these files with puppet - please to not be bothering us
file=/etc/timezone
# We handle these files with puppet - please to not be bothering us
file=/etc/timezone
+file=/etc/motd.tail
file=/etc/samhain/samhainrc
file=/etc/munin/munin-node.conf
file=/etc/userdir-ldap.confc
file=/etc/samhain/samhainrc
file=/etc/munin/munin-node.conf
file=/etc/userdir-ldap.confc
@@
-228,7
+229,7
@@
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
file=/etc/default/puppet
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
-dir=
4
/etc/puppet
+dir=
8
/etc/puppet
file=/usr/sbin/dsa-update-apt-status
file=/usr/sbin/dsa-update-samhain-status
file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
file=/usr/sbin/dsa-update-apt-status
file=/usr/sbin/dsa-update-samhain-status
file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
@@
-253,6
+254,7
@@
file=/usr/lib/nagios/plugins/dsa-check-raid-areca
file=/usr/lib/nagios/plugins/dsa-check-raid-sw
file=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
file=/usr/lib/nagios/plugins/dsa-check-raid-sw
file=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
+file=/etc/pam.d/sudo
file=/etc/blkid.tab
file=/etc/blkid.tab.old
file=/etc/monit/monitrc
file=/etc/blkid.tab
file=/etc/blkid.tab.old
file=/etc/monit/monitrc