projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now bad path
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
2072ae6
..
3c1f91a
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-68,7
+68,7
@@
# RedefUser0=(no default)
# RedefUser1=(no default)
<% if nodeinfo['buildd'] -%>
# RedefUser0=(no default)
# RedefUser1=(no default)
<% if nodeinfo['buildd'] -%>
-IgnoreMissing=/etc/lvm/archive/
vg
.*.vg
+IgnoreMissing=/etc/lvm/archive/.*.vg
<% end -%>
[Attributes]
<% end -%>
[Attributes]
@@
-79,6
+79,7
@@
file=/etc/mtab
file=/etc/ssh_random_seed
file=/etc/asound.conf
<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
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/resolv.conf
<% end -%>
file=/etc/localtime
@@
-135,7
+136,6
@@
file=/etc/nagios/obsolete-packages-ignore.d
file=/etc/bind/geodns
<% if nodeinfo['nagiosmaster'] -%>
file=/etc/nagios3/puppetconf.d
file=/etc/bind/geodns
<% if nodeinfo['nagiosmaster'] -%>
file=/etc/nagios3/puppetconf.d
-file=/etc/puppet
<% end -%>
file=/etc/puppet
file=/etc/cron.d
<% end -%>
file=/etc/puppet
file=/etc/cron.d
@@
-149,6
+149,7
@@
file=/etc/syslog-ng
file=/etc/ferm/
file=/etc/ferm/conf.d
file=/etc/ferm/dsa.d
file=/etc/ferm/
file=/etc/ferm/conf.d
file=/etc/ferm/dsa.d
+file=/etc/rc.local
[LogFiles]
[LogFiles]
@@
-214,6
+215,9
@@
file=/var/log/syslog
<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
file=/etc/resolv.conf
<% end -%>
<% 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
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
file=/etc/postfix/debian.db
@@
-247,6
+251,7
@@
file=/etc/exim4/localusers
file=/etc/exim4/manualroute
file=/etc/exim4/rbllist
file=/etc/exim4/rhsbllist
file=/etc/exim4/manualroute
file=/etc/exim4/rbllist
file=/etc/exim4/rhsbllist
+file=/etc/exim4/submission-domains
file=/etc/exim4/virtualdomains
file=/etc/exim4/whitelist
file=/etc/exim4/local-settings.conf
file=/etc/exim4/virtualdomains
file=/etc/exim4/whitelist
file=/etc/exim4/local-settings.conf
@@
-323,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/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
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
file=/etc/logrotate.d/syslog-ng
@@
-366,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-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
<% end -%>
<% if nodeinfo['muninmaster'] -%>
file=/etc/munin/munin.conf
@@
-376,7
+383,7
@@
dir=8/etc/puppet
<% if classes.include?('named::geodns') -%>
dir=1/etc/bind/geodns
<% end -%>
<% if classes.include?('named::geodns') -%>
dir=1/etc/bind/geodns
<% end -%>
-<% if classes.include?('named::
secondary
') -%>
+<% if classes.include?('named::
authoritative
') -%>
dir=1/etc/bind
file=/etc/bind/named.conf.debian-zones
<% end -%>
dir=1/etc/bind
file=/etc/bind/named.conf.debian-zones
<% end -%>
@@
-391,6
+398,7
@@
dir=1/etc/ferm/dsa.d
file=/etc/ferm/conf.d/me.conf
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
file=/etc/ferm/conf.d/me.conf
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
+dir=2/etc/ssl/debian
[IgnoreNone]
##
[IgnoreNone]
##
@@
-543,7
+551,7
@@
MailSeverity=crit
PrintSeverity=none
LogSeverity=info
SyslogSeverity=alert
PrintSeverity=none
LogSeverity=info
SyslogSeverity=alert
-ExportSeverity=none
+
#
ExportSeverity=none
@@
-610,7
+618,7
@@
ExportSeverity=none
## Switch on/off
#
## Switch on/off
#
-KernelCheckActive = True
+
#
KernelCheckActive = True
## Check interval (seconds); btw., the check is VERY fast
#
## Check interval (seconds); btw., the check is VERY fast
#
@@
-628,7
+636,7
@@
KernelCheckActive = True
## Switch on/off
#
## Switch on/off
#
-LoginCheckActive = True
+
#
LoginCheckActive = True
## Severity for logins, multiple logins, logouts
#
## Severity for logins, multiple logins, logouts
#