X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=baa7b5ad3cdf875a090544fae70ba9a3ba2213e8;hb=4fd2a89f6e76cf67ba3ddd1ca6b512c2b4501be8;hp=bdcbfe139f4e73cb05445f902b0d426a2ac002e2;hpb=d70442a3c371fe1a0ccc12e600cee0aa27497fe9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index bdcbfe139..baa7b5ad3 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -103,12 +103,9 @@ file=/etc/bind/geodns/recvconf.files
 file=/etc/bind/named.conf.options
 <% end -%>
 file=/etc/apache2/conf.d/puppet-builddlist
-<% if classes.include?("roles::static_mirror") -%>
+<% if classes.include?("roles::static_mirror_web") -%>
 file=/etc/apache2/sites-available/static-vhosts-simple
-file=/etc/static-clients.conf
-<% elsif classes.include?("roles::static_master") -%>
-file=/etc/static-clients.conf
-<% elsif classes.include?("roles::static_source") -%>
+<% elsif classes.include?("staticsync::static_master") -%>
 file=/etc/static-clients.conf
 <% end -%>
 <% if classes.include?("apache2") -%>
@@ -149,6 +146,7 @@ file=/etc/munin/plugin-conf.d
 file=/etc/munin/munin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
+file=/etc/exim4/conf.d
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
@@ -171,6 +169,8 @@ file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/schroot/default
+file=/etc/schroot/dsa
+file=/etc/schroot/dsa/default-mirror
 file=/etc/schroot/setup.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
@@ -182,14 +182,7 @@ file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
 file=/etc/rabbitmq
-<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or scope.function_has_role(['static_master']) -%>
-file=/etc/ssh/userkeys
-file=/etc/ssh/userkeys/staticsync
-<% end -%>
-<% if scope.function_has_role(['ssh.upload.d.o']) -%>
-file=/etc/ssh/userkeys/buildd-uploader
-<% end -%>
-<% if scope.function_has_role(['buildd_master']) -%>
+<% if classes.include?('roles::buildd_master') -%>
 file=/etc/ssh/userkeys/wb-buildd.more
 <% end -%>
 file=/etc/rsyncd
@@ -263,7 +256,7 @@ dir=-1/srv
 ## This file might be created or removed by the system sometimes.
 ##
 file=/etc/resolv.conf
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
+<% if classes.include?('roles::buildd') -%>
 file=/etc/dupload.conf
 file=/etc/buildd/buildd.conf
 file=/etc/sbuild/sbuild.conf
@@ -275,7 +268,6 @@ file=/etc/postfix/debian
 file=/etc/ssh/ssh_known_hosts
 file=/etc/ssh/ssh-rsa-shadow
 file=/var/lib/misc/ssh-rsa-shadow
-file=/etc/.da-backup.trace
 file=/etc/postfix/debianhosts
 file=/etc/postfix/debianhosts.db
 file=/etc/blkid.tab
@@ -318,7 +310,7 @@ file=/etc/exim4/ssl/thishost.key
 dir=3/etc/exim4/email-virtualdomains
 file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
-file=/etc/dsa/cron.ignore.dsa-puppet-stuff
+file=/etc/dsa/cron.ignore.puppet-crontab
 file=/etc/vsftpd.conf
 file=/etc/aliases
 file=/etc/multipath.conf
@@ -330,7 +322,7 @@ dir=/etc/bacula/storage-conf.d
 dir=/etc/bacula/conf.d
 <%=
 out=""
-if scope.lookupvar('site::nodeinfo')['heavy_exim']
+if scope.lookupvar('deprecated::nodeinfo')['heavy_exim']
   out = '
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
@@ -386,15 +378,11 @@ file=/etc/apache2/sites-available/www.debian.org
 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/buildd.debian.org-proposed.list
-file=/etc/apt/sources.list.d/buildd.debian.org-experimental.list
 file=/etc/apt/sources.list.d/geoip.list
 file=/etc/apt/sources.list.d/backports.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/db.debian.org.restricted.list
 file=/etc/apt/sources.list.d/debian.list
 file=/etc/apt/sources.list.d/backports.org.list
 file=/etc/apt/apt.conf.d/local-compression
@@ -442,7 +430,7 @@ file=/etc/pam.d/sudo
 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/cron.d/puppet-crontab
 file=/etc/cron.weekly/stunnel-ekey-restart
 file=/etc/default/schroot
 file=/etc/schroot/default/nssdatabases
@@ -464,7 +452,7 @@ file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% if scope.function_has_role(['muninmaster']) -%>
 file=/etc/munin/munin.conf
 <% end -%>
-<% if scope.function_has_role(['puppetmaster']) -%>
+<% if classes.include?('roles::puppetmaster') -%>
 dir=8/etc/puppet
 <% end -%>  
 <% if classes.include?('named::geodns') -%>
@@ -498,7 +486,7 @@ file=/etc/openvpn/deb-mgmt-clients.pool
 file=/etc/rsyncd/debian.secrets
 
 
-<% if scope.function_has_role(['puppetmaster']) %>
+<% if classes.include?('roles::puppetmaster') -%>
 
 # Damn you rails apps and your shoddy packaging
 file=/usr/share/puppet-dashboard/public/stylesheets
@@ -508,9 +496,6 @@ file=/usr/share/puppet-dashboard/public/javascripts/all.js
 dir=1/usr/share/puppet-dashboard/tmp/pids
 <% end -%>
 
-<% if classes.include?("porterbox") %>
-file=/etc/cron.weekly/puppet-mail-big-homedirs
-<% end -%>
 file=/etc/ssl/private/*.key-certchain
 dir=10/var/lib/puppet/clientbucket
 
@@ -532,15 +517,24 @@ dir=10/var/lib/puppet/clientbucket
 ## for these files, only access time is ignored
 ##
 dir=/usr/bin
+<%- if has_variable?("merged_usr") && @merged_usr -%>
+file=/bin
+<% else -%>
 dir=/bin
+<% end -%>
 dir=/boot
 #
 # SuSE (old) has the boot init scripts in /sbin/init.d/*, 
 # so we go 3 levels deep
 #
+<%- if has_variable?("merged_usr") && @merged_usr -%>
+file=/lib
+file=/sbin
+<% else -%>
 dir=3/sbin
-dir=/usr/sbin
 dir=/lib
+<% end -%>
+dir=/usr/sbin
 dir=3/usr/lib
 dir=3/usr/share
 #