X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=9ed15dfbd959d7e6dc324b68d49b4d81cc6701e6;hb=103e56b48752f77fd66edd1824d82946570ca033;hp=9515fb20b6ee1b6a4d6d98b2bf2ae1f9ebdb9599;hpb=199a9b1ad0770295422ed9001b94ac9e1670655d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 9515fb20b..9ed15dfbd 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -67,7 +67,7 @@
 # RedefIgnoreNone=(no default)
 # RedefUser0=(no default)
 # RedefUser1=(no default)
-<% if nodeinfo['buildd'] -%>
+<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 IgnoreMissing=/etc/lvm/archive/.*.vg
 <% end -%>
 
@@ -91,6 +91,7 @@ file=/etc/network/run/ifstate
 file=/var/state/samhain/samhain_file
 file=/etc/bind/zones/db.debian.net
 file=/etc/exim4/bsmtp
+file=/etc/fake-hwclock.data
 <% if classes.include?("named::geodns") -%>
 file=/etc/bind
 file=/etc/bind/named.conf.acl
@@ -132,11 +133,12 @@ file=/etc/nagios
 file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
-<% if nodeinfo['nagiosmaster'] -%>
+<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
 file=/etc/nagios3/puppetconf.d
 <% end -%>
 file=/etc/puppet
 file=/etc/cron.d
+file=/etc/cron.weekly
 file=/usr/lib/nagios/plugins
 file=/usr/sbin
 file=/etc/monit
@@ -144,22 +146,30 @@ file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
+file=/etc/stunnel
 file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-<% unless lsbdistcodename == 'lenny' %>
 file=/etc/unbound
-<% end -%>
 file=/etc/dsa
+<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>
+
+# Damn you rails apps and your shoddy packaging
+file=/usr/share/puppet-dashboard/public/stylesheets
+file=/usr/share/puppet-dashboard/public/javascripts
+file=/usr/share/puppet-dashboard/public/stylesheets/all.css
+file=/usr/share/puppet-dashboard/public/javascripts/all.js
+<% end -%>
 
 [LogFiles]
 ##
 ## for these files, changes in signature, timestamps, and size are ignored 
 ##
-file=/var/run/utmp
 file=/etc/motd
 
+# is on tmpfs, ignore.
+#file=/var/run/utmp
 
 
 #####################################################################
@@ -214,7 +224,7 @@ file=/var/log/syslog
 ## This file might be created or removed by the system sometimes.
 ##
 file=/etc/resolv.conf
-<% if nodeinfo['buildd'] -%>
+<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 file=/etc/dupload.conf
 <% end -%>
 file=/etc/resolv.conf.pcmcia.save
@@ -261,9 +271,10 @@ file=/etc/exim4/ssl/thishost.key
 file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
 file=/etc/dsa/cron.ignore.dsa-puppet-stuff
+file=/etc/vsftpd.conf
 <%=
 out=""
-if nodeinfo['heavy_exim']
+if scope.lookupvar('site::nodeinfo')['heavy_exim']
   out = '
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
@@ -320,7 +331,9 @@ file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
 file=/etc/apt/sources.list.d/buildd.list
+file=/etc/apt/sources.list.d/buildd.debian.org.list
 file=/etc/apt/sources.list.d/debian.org.list
+file=/etc/apt/sources.list.d/db.debian.org.list
 file=/etc/apt/sources.list.d/debian.restricted.list
 file=/etc/apt/sources.list.d/debian.list
 file=/etc/apt/sources.list.d/backports.org.list
@@ -362,6 +375,7 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-areca
 file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
+file=/etc/stunnel/puppet-ekeyd-peer.pem
 file=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
@@ -369,7 +383,8 @@ 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
-<% if nodeinfo['nagiosmaster'] -%>
+file=/etc/cron.weekly/stunnel-ekey-restart
+<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
 file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
 file=/etc/nagios3/puppetconf.d/auto-services.cfg
@@ -379,10 +394,10 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
 file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% end -%>
-<% if nodeinfo['muninmaster'] -%>
+<% if scope.lookupvar('site::nodeinfo')['muninmaster'] -%>
 file=/etc/munin/munin.conf
 <% end -%>
-<% if nodeinfo['puppetmaster'] -%>
+<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] -%>
 dir=8/etc/puppet
 <% end -%>  
 <% if classes.include?('named::geodns') -%>
@@ -392,20 +407,20 @@ dir=1/etc/bind/geodns
 dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones
 <% end -%>
-<% if fqdn == "dijkstra.debian.org" -%>
+<% if scope.lookupvar('::fqdn') == "dijkstra.debian.org" -%>
 dir=4/etc/dsa-kvm
 <% end -%>
-<% if nodeinfo['buildd'] -%>
+<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 dir=3/etc/lvm
 <% end -%>
 dir=1/etc/ferm/dsa.d
+dir=1/etc/ferm/conf.d
+dir=3/etc/facter
 file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
-<% unless lsbdistcodename == 'lenny' %>
 file=/etc/unbound/unbound.conf
-<% end -%>
 
 [IgnoreNone]
 ##