projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore a file generated by an automatic upgrade
[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
e3083d0
..
1053129
100644
(file)
--- a/
modules/samhain/files/per-host/handel.debian.org/samhainrc
+++ b/
modules/samhain/files/per-host/handel.debian.org/samhainrc
@@
-190,8
+190,10
@@
file=/etc/postfix/debianhosts
file=/etc/postfix/debianhosts.db
# We handle these files with puppet - please to not be bothering us
file=/etc/postfix/debianhosts.db
# We handle these files with puppet - please to not be bothering us
+file=/etc/timezone
file=/etc/samhain/samhainrc
file=/etc/munin/munin-node.conf
file=/etc/samhain/samhainrc
file=/etc/munin/munin-node.conf
+file=/etc/userdir-ldap.confc
file=/etc/exim4/blacklist
file=/etc/exim4/callout_users
file=/etc/exim4/exim4.conf
file=/etc/exim4/blacklist
file=/etc/exim4/callout_users
file=/etc/exim4/exim4.conf
@@
-199,6
+201,7
@@
file=/etc/exim4/grey_users
file=/etc/exim4/helo-check
file=/etc/exim4/locals
file=/etc/exim4/localusers
file=/etc/exim4/helo-check
file=/etc/exim4/locals
file=/etc/exim4/localusers
+file=/etc/exim4/manualroute
file=/etc/exim4/rbllist
file=/etc/exim4/rcpthosts
file=/etc/exim4/rhsbllist
file=/etc/exim4/rbllist
file=/etc/exim4/rcpthosts
file=/etc/exim4/rhsbllist