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+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
cb355f6
..
64ebe22
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-75,7
+75,10
@@
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" then ""
+else -%>
file=/etc/resolv.conf
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
@@
-115,6
+118,7
@@
files=/etc/apache2/mods-enabled
file=/etc/samhain
file=/etc/munin
file=/etc/munin/plugins
file=/etc/samhain
file=/etc/munin
file=/etc/munin/plugins
+file=/etc/munin/plugin-conf.d
file=/etc/exim4
file=/etc/exim4/ssl
file=/etc/apt
file=/etc/exim4
file=/etc/exim4/ssl
file=/etc/apt
@@
-204,6
+208,10
@@
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" then "" -%>
+file=/etc/resolv.conf
+<% else
+end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
file=/etc/postfix/debian.db
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
file=/etc/postfix/debian.db
@@
-224,6
+232,7
@@
file=/etc/motd.tail
file=/etc/ntp.conf
file=/etc/samhain/samhainrc
file=/etc/munin/munin-node.conf
file=/etc/ntp.conf
file=/etc/samhain/samhainrc
file=/etc/munin/munin-node.conf
+file=/etc/munin/plugin-conf.d/munin-node
file=/etc/userdir-ldap.confc
file=/etc/exim4/blacklist
file=/etc/exim4/host_blacklist
file=/etc/userdir-ldap.confc
file=/etc/exim4/blacklist
file=/etc/exim4/host_blacklist
@@
-235,11
+244,9
@@
file=/etc/exim4/locals
file=/etc/exim4/localusers
file=/etc/exim4/manualroute
file=/etc/exim4/rbllist
file=/etc/exim4/localusers
file=/etc/exim4/manualroute
file=/etc/exim4/rbllist
-file=/etc/exim4/rcpthosts
file=/etc/exim4/rhsbllist
file=/etc/exim4/virtualdomains
file=/etc/exim4/whitelist
file=/etc/exim4/rhsbllist
file=/etc/exim4/virtualdomains
file=/etc/exim4/whitelist
-file=/etc/exim4/local-auto.conf
file=/etc/exim4/local-settings.conf
file=/etc/exim4/ssl/ca.crt
file=/etc/exim4/ssl/ca.crl
file=/etc/exim4/local-settings.conf
file=/etc/exim4/ssl/ca.crt
file=/etc/exim4/ssl/ca.crl
@@
-260,6
+267,8
@@
file=/etc/clamav-unofficial-sigs.dsa.conf
end
out
%>
end
out
%>
+file=/etc/munin/plugins/bind
+file=/etc/munin/plugins/bind_views
file=/etc/munin/plugins/cpu
file=/etc/munin/plugins/df
file=/etc/munin/plugins/df_abs
file=/etc/munin/plugins/cpu
file=/etc/munin/plugins/df
file=/etc/munin/plugins/df_abs
@@
-272,14
+281,22
@@
file=/etc/munin/plugins/irqstats
file=/etc/munin/plugins/load
file=/etc/munin/plugins/memory
file=/etc/munin/plugins/ntp_offset
file=/etc/munin/plugins/load
file=/etc/munin/plugins/memory
file=/etc/munin/plugins/ntp_offset
+file=/etc/munin/plugins/ntp_states
file=/etc/munin/plugins/open_files
file=/etc/munin/plugins/open_inodes
file=/etc/munin/plugins/processes
file=/etc/munin/plugins/open_files
file=/etc/munin/plugins/open_inodes
file=/etc/munin/plugins/processes
+file=/etc/munin/plugins/ps_apache2
+file=/etc/munin/plugins/ps_exim4
+file=/etc/munin/plugins/ps_vsftpd
+file=/etc/munin/plugins/spamassassin
file=/etc/munin/plugins/swap
file=/etc/munin/plugins/swap
+file=/etc/munin/plugins/uptime
file=/etc/munin/plugins/vmstat
file=/etc/munin/plugins/vmstat
+file=/etc/munin/plugins/vfstpd
file=/etc/munin/plugins/apache_accesses
file=/etc/munin/plugins/apache_processes
file=/etc/munin/plugins/apache_volume
file=/etc/munin/plugins/apache_accesses
file=/etc/munin/plugins/apache_processes
file=/etc/munin/plugins/apache_volume
+file=/etc/munin/plugins/apache_servers
file=/etc/munin/plugins/exim_mailqueue
file=/etc/munin/plugins/exim_mailstats
file=/etc/munin/plugins/postfix_mailqueue
file=/etc/munin/plugins/exim_mailqueue
file=/etc/munin/plugins/exim_mailstats
file=/etc/munin/plugins/postfix_mailqueue
@@
-339,6
+356,7
@@
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet
file=/etc/monit/monit.d/00debian.org
file=/etc/cron.d/dsa-puppet-stuff
file=/etc/monit/monit.d/01puppet
file=/etc/monit/monit.d/00debian.org
file=/etc/cron.d/dsa-puppet-stuff
+file=/etc/cron.d/dsa-buildd
<%= extrafiles=""
case fqdn
when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
<%= extrafiles=""
case fqdn
when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
@@
-350,6
+368,8
@@
file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
when "handel.debian.org": extrafiles="dir=8/etc/puppet"
when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
when "handel.debian.org": extrafiles="dir=8/etc/puppet"
when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
+when /(senfl|ravel|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind
+file=/etc/bind/named.conf.debian-zones"
end
extrafiles
%>
end
extrafiles
%>