X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=556ab20338e74d6bdf4e9e3d8851c5c3235ac7de;hb=9d4afa904a0cb5612e99c2351149e6197e2fa08b;hp=2758d46765fbf068fcd5a0ea21c97fc535c56cc9;hpb=5ea69733aab993c0fe3f2cf731f2d7a3c0328939;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 2758d4676..556ab2033 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -110,6 +110,7 @@ file=/etc/static-clients.conf <% elsif classes.include?("roles::static_source") -%> file=/etc/static-clients.conf <% end -%> +file=/etc/multipath/wwids # # There are files in /etc that might change, thus changing the directory @@ -120,6 +121,9 @@ file=/etc/ssh file=/etc/network/run file=/etc/bind/zones file=/etc/spamassassin/sa-update-keys +file=/etc/init.d/.depend.boot +file=/etc/init.d/.depend.start +file=/etc/init.d/.depend.stop # These are the directories for the files we handle with puppet file=/etc/apache2/conf.d @@ -170,6 +174,7 @@ file=/etc/rabbitmq file=/etc/ssh/userkeys file=/etc/ssh/userkeys/staticsync <% end -%> +file=/etc/rsyncd [LogFiles] ## @@ -235,6 +240,8 @@ file=/var/log/syslog file=/etc/resolv.conf <% if scope.lookupvar('site::nodeinfo')['buildd'] -%> file=/etc/dupload.conf +file=/etc/buildd/buildd.conf +file=/etc/sbuild/sbuild.conf <% end -%> file=/etc/resolv.conf.pcmcia.save file=/etc/nologin @@ -385,6 +392,7 @@ file=/etc/nagios/nrpe.d/nrpe_dsa.cfg file=/etc/nagios/nrpe.d/debianorg.cfg file=/etc/nagios/obsolete-packages-ignore file=/etc/nagios/obsolete-packages-ignore.d/hostspecific +file=/etc/nagios/check-libs.conf file=/usr/lib/nagios/plugins/dsa-check-packages file=/usr/lib/nagios/plugins/dsa-check-soas file=/usr/lib/nagios/plugins/dsa-check-mirrorsync @@ -451,6 +459,7 @@ dir=3/etc/facter file=/etc/ferm/conf.d/me.conf file=/etc/ferm/conf.d/defs.conf file=/etc/ferm/ferm.conf +file=/etc/ssl/README dir=2/etc/ssl/debian dir=1/etc/ssl/certs dir=1/etc/ssl/ca-debian @@ -458,10 +467,12 @@ dir=1/etc/ssl/ca-global file=/etc/ca-certificates.conf file=/etc/ca-certificates-debian.conf file=/etc/ca-certificates-global.conf +file=/etc/ssl/private/ssl-cert-snakeoil.key file=/etc/unbound/unbound.conf <% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%> file=/etc/openvpn/deb-mgmt-clients.pool <% end -%> +file=/etc/rsyncd/debian.secrets <% if scope.function_has_role(['puppetmaster']) %>