projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore lvm files for samhain on all machines, not just buildds
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
0f227ed
..
a829b02
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-67,9
+67,7
@@
# RedefIgnoreNone=(no default)
# RedefUser0=(no default)
# RedefUser1=(no default)
# RedefIgnoreNone=(no default)
# RedefUser0=(no default)
# RedefUser1=(no default)
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
IgnoreMissing=/etc/lvm/archive/.*.vg
IgnoreMissing=/etc/lvm/archive/.*.vg
-<% end -%>
[Attributes]
##
[Attributes]
##
@@
-104,6
+102,12
@@
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_base") -%>
+file=/etc/static-components.conf
+<% end -%>
+<% if classes.include?("roles::static_mirror") -%>
+file=/etc/apache2/sites-available/static-vhosts-simple
+<% end -%>
#
# There are files in /etc that might change, thus changing the directory
#
# There are files in /etc that might change, thus changing the directory
@@
-264,6
+268,7
@@
file=/etc/exim4/rbllist
file=/etc/exim4/rhsbllist
file=/etc/exim4/submission-domains
file=/etc/exim4/virtualdomains
file=/etc/exim4/rhsbllist
file=/etc/exim4/submission-domains
file=/etc/exim4/virtualdomains
+file=/etc/exim4/email-virtualdomains
file=/etc/exim4/whitelist
file=/etc/exim4/local-settings.conf
file=/etc/exim4/ssl/ca.crt
file=/etc/exim4/whitelist
file=/etc/exim4/local-settings.conf
file=/etc/exim4/ssl/ca.crt
@@
-274,6
+279,7
@@
file=/etc/ssh/ssh_config
file=/etc/ssh/sshd_config
file=/etc/dsa/cron.ignore.dsa-puppet-stuff
file=/etc/vsftpd.conf
file=/etc/ssh/sshd_config
file=/etc/dsa/cron.ignore.dsa-puppet-stuff
file=/etc/vsftpd.conf
+file=/etc/aliases
<%=
out=""
if scope.lookupvar('site::nodeinfo')['heavy_exim']
<%=
out=""
if scope.lookupvar('site::nodeinfo')['heavy_exim']
@@
-382,6
+388,7
@@
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=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
file=/etc/stunnel/puppet-ekeyd-peer.pem
+file=/etc/stunnel/puppet-ekeyd.conf
file=/etc/sysctl.d/mmap_min_addr.conf
file=/etc/pam.d/sudo
file=/etc/monit/monitrc
file=/etc/sysctl.d/mmap_min_addr.conf
file=/etc/pam.d/sudo
file=/etc/monit/monitrc
@@
-413,12
+420,8
@@
dir=1/etc/bind/geodns
dir=1/etc/bind
file=/etc/bind/named.conf.debian-zones
<% end -%>
dir=1/etc/bind
file=/etc/bind/named.conf.debian-zones
<% end -%>
-<% if scope.lookupvar('::fqdn') == "dijkstra.debian.org" -%>
-dir=4/etc/dsa-kvm
-<% end -%>
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
-dir=3/etc/lvm
-<% end -%>
+dir=3/etc/lvm/archive
+dir=3/etc/lvm/backup
dir=1/etc/ferm/dsa.d
dir=1/etc/ferm/conf.d
dir=3/etc/facter
dir=1/etc/ferm/dsa.d
dir=1/etc/ferm/conf.d
dir=3/etc/facter
@@
-427,6
+430,10
@@
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
file=/etc/unbound/unbound.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
file=/etc/unbound/unbound.conf
+<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
+file=/etc/openvpn/deb-mgmt-clients.pool
+<% end -%>
+
<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>
<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>