projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ferm.conf is now (kind of, almost) under puppet control
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
e4afdac
..
1efe185
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-134,13
+134,13
@@
file=/etc/nagios/nrpe.d
file=/etc/nagios/obsolete-packages-ignore.d
file=/etc/bind/geodns
<%= extradir=""
file=/etc/nagios/obsolete-packages-ignore.d
file=/etc/bind/geodns
<%= extradir=""
-case fqdn
-
when "tchaikovsky.debian.org":
extradir="file=/etc/nagios3/puppetconf.d
+if nodeinfo['nagiosmaster']
+
extradir="file=/etc/nagios3/puppetconf.d
file=/etc/puppet"
file=/etc/puppet"
-else extradir="file=/etc/puppet"
end
extradir
%>
end
extradir
%>
+file=/etc/puppet
file=/etc/cron.d
file=/usr/lib/nagios/plugins
file=/usr/sbin
file=/etc/cron.d
file=/usr/lib/nagios/plugins
file=/usr/sbin
@@
-149,6
+149,8
@@
file=/etc/monit/monit.d
file=/etc/pam.d
file=/etc/sysctl.d
file=/etc/syslog-ng
file=/etc/pam.d
file=/etc/sysctl.d
file=/etc/syslog-ng
+file=/etc/ferm/conf.d
+file=/etc/ferm/dsa.d
[LogFiles]
[LogFiles]
@@
-381,6
+383,10
@@
extrafiles
<% if nodeinfo['buildd'] -%>
dir=3/etc/lvm
<% end -%>
<% if nodeinfo['buildd'] -%>
dir=3/etc/lvm
<% end -%>
+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
[IgnoreNone]
##
[IgnoreNone]
##