projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temporarily hardcode debian.org and end of searchpaths
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
b2be07a
..
e72f5d4
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-68,6
+68,7
@@
# RedefUser0=(no default)
# RedefUser1=(no default)
IgnoreMissing=/etc/lvm/archive/.*.vg
# RedefUser0=(no default)
# RedefUser1=(no default)
IgnoreMissing=/etc/lvm/archive/.*.vg
+IgnoreMissing=/var/lib/puppet/clientbucket/.*
[Attributes]
##
[Attributes]
##
@@
-148,6
+149,7
@@
file=/etc/munin/plugin-conf.d
file=/etc/munin/munin-conf.d
file=/etc/exim4
file=/etc/exim4/ssl
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
file=/etc/apt
file=/etc/apt/apt.conf.d
file=/etc/apt/sources.list.d
@@
-170,6
+172,8
@@
file=/etc/monit
file=/etc/monit/monit.d
file=/etc/pam.d
file=/etc/schroot/default
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
file=/etc/schroot/setup.d
file=/etc/sysctl.d
file=/etc/syslog-ng
@@
-185,6
+189,12
@@
file=/etc/rabbitmq
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
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 classes.include?('roles::buildd_master') -%>
+file=/etc/ssh/userkeys/wb-buildd.more
+<% end -%>
file=/etc/rsyncd
<%- if @hostname == "sibelius" then -%>
file=/etc/tsm
file=/etc/rsyncd
<%- if @hostname == "sibelius" then -%>
file=/etc/tsm
@@
-256,7
+266,7
@@
dir=-1/srv
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
## 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
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
file=/etc/sbuild/sbuild.conf
@@
-379,15
+389,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/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/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/d
ebian
.restricted.list
+file=/etc/apt/sources.list.d/d
b.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
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
@@
-457,7
+463,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(['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') -%>
dir=8/etc/puppet
<% end -%>
<% if classes.include?('named::geodns') -%>
@@
-491,7
+497,7
@@
file=/etc/openvpn/deb-mgmt-clients.pool
file=/etc/rsyncd/debian.secrets
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
# Damn you rails apps and your shoddy packaging
file=/usr/share/puppet-dashboard/public/stylesheets
@@
-501,10
+507,8
@@
file=/usr/share/puppet-dashboard/public/javascripts/all.js
dir=1/usr/share/puppet-dashboard/tmp/pids
<% end -%>
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
file=/etc/ssl/private/*.key-certchain
+dir=10/var/lib/puppet/clientbucket
[IgnoreNone]
##
[IgnoreNone]
##
@@
-524,15
+528,24
@@
file=/etc/ssl/private/*.key-certchain
## for these files, only access time is ignored
##
dir=/usr/bin
## for these files, only access time is ignored
##
dir=/usr/bin
+<%- if has_variable?("merged_usr") && @merged_usr -%>
+file=/bin
+<% else -%>
dir=/bin
dir=/bin
+<% end -%>
dir=/boot
#
# SuSE (old) has the boot init scripts in /sbin/init.d/*,
# so we go 3 levels deep
#
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=3/sbin
-dir=/usr/sbin
dir=/lib
dir=/lib
+<% end -%>
+dir=/usr/sbin
dir=3/usr/lib
dir=3/usr/share
#
dir=3/usr/lib
dir=3/usr/share
#