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 git://git.debian.org/mirror/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
52a932a
..
820dbdb
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-78,10
+78,6
@@
IgnoreMissing=/etc/lvm/archive/.*.vg
file=/etc/mtab
file=/etc/ssh_random_seed
file=/etc/asound.conf
file=/etc/mtab
file=/etc/ssh_random_seed
file=/etc/asound.conf
-<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
-<% else -%>
-file=/etc/resolv.conf
-<% end -%>
file=/etc/localtime
file=/etc/ioctl.save
file=/etc/passwd.backup
file=/etc/localtime
file=/etc/ioctl.save
file=/etc/passwd.backup
@@
-105,6
+101,7
@@
file=/etc/bind/geodns/recvconf.files
<% if classes.include?("named") -%>
file=/etc/bind/named.conf.options
<% end -%>
<% if classes.include?("named") -%>
file=/etc/bind/named.conf.options
<% end -%>
+file=/etc/apache2/conf.d/puppet-builddlist
#
# There are files in /etc that might change, thus changing the directory
#
# There are files in /etc that might change, thus changing the directory
@@
-212,9
+209,7
@@
file=/var/log/syslog
##
## This file might be created or removed by the system sometimes.
##
##
## This file might be created or removed by the system sometimes.
##
-<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
file=/etc/resolv.conf
file=/etc/resolv.conf
-<% end -%>
<% if nodeinfo['buildd'] -%>
file=/etc/dupload.conf
<% end -%>
<% if nodeinfo['buildd'] -%>
file=/etc/dupload.conf
<% end -%>
@@
-315,6
+310,7
@@
file=/etc/apache2/mods-enabled/server.conf
file=/etc/apache2/mods-enabled/server.load
file=/etc/apache2/conf.d/server-status
file=/etc/apache2/conf.d/local-serverinfo
file=/etc/apache2/mods-enabled/server.load
file=/etc/apache2/conf.d/server-status
file=/etc/apache2/conf.d/local-serverinfo
+file=/etc/apache2/sites-available/www.debian.org
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