X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=3c1f91aa968f27d6c2b8b5d675ebc422da78e349;hb=516dbb286709cdad70269bb0345587160f31e396;hp=3c5bec9df6900d7de8187bb1ee2314ee71308b66;hpb=7b4f24c7e7b0a1e9f85bd2c46d97714a4cebff0f;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 3c5bec9df..3c1f91aa9 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -149,6 +149,7 @@ file=/etc/syslog-ng file=/etc/ferm/ file=/etc/ferm/conf.d file=/etc/ferm/dsa.d +file=/etc/rc.local [LogFiles] @@ -214,6 +215,9 @@ file=/var/log/syslog <% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%> file=/etc/resolv.conf <% end -%> +<% if nodeinfo['buildd'] -%> +file=/etc/dupload.conf +<% end -%> file=/etc/resolv.conf.pcmcia.save file=/etc/nologin file=/etc/postfix/debian.db @@ -324,6 +328,7 @@ file=/etc/apt/apt.conf.d/local-pdiffs file=/etc/puppet/puppet.conf file=/etc/default/puppet file=/etc/default/postgrey +file=/etc/default/syslog-ng file=/etc/logrotate.d/exim4-paniclog file=/etc/logrotate.d/exim4-base file=/etc/logrotate.d/syslog-ng @@ -367,6 +372,7 @@ file=/etc/nagios3/puppetconf.d/auto-services.cfg file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg +file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg <% end -%> <% if nodeinfo['muninmaster'] -%> file=/etc/munin/munin.conf