projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch the statis hosts to hiera roles
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
56bc38f
..
262c71a
100644
(file)
--- 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
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/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") -%>
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/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
@@
-184,14
+182,10
@@
file=/etc/rc.local
file=/etc/unbound
file=/etc/dsa
file=/etc/rabbitmq
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(['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
file=/etc/ssh/userkeys/wb-buildd.more
<% end -%>
file=/etc/rsyncd
@@
-265,7
+259,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
@@
-320,7
+314,7
@@
file=/etc/exim4/ssl/thishost.key
dir=3/etc/exim4/email-virtualdomains
file=/etc/ssh/ssh_config
file=/etc/ssh/sshd_config
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
file=/etc/vsftpd.conf
file=/etc/aliases
file=/etc/multipath.conf
@@
-332,7
+326,7
@@
dir=/etc/bacula/storage-conf.d
dir=/etc/bacula/conf.d
<%=
out=""
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
out = '
file=/etc/exim4/surbl_whitelist.txt
file=/etc/exim4/exim_surbl.pl
@@
-440,7
+434,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/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
file=/etc/cron.weekly/stunnel-ekey-restart
file=/etc/default/schroot
file=/etc/schroot/default/nssdatabases
@@
-462,7
+456,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') -%>
@@
-496,7
+490,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
@@
-506,9
+500,6
@@
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
dir=10/var/lib/puppet/clientbucket
file=/etc/ssl/private/*.key-certchain
dir=10/var/lib/puppet/clientbucket
@@
-530,15
+521,24
@@
dir=10/var/lib/puppet/clientbucket
## 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
#