X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=812a4357d745d1ea4930f1ef95b8d89dd7ba7689;hb=30ded286aa613ac41cb61d3c028f9ad1aed87cc8;hp=9ba82ada50833130573087720cf98b6752af86c4;hpb=1821dd249668dfe13c4eff3d68f6eaa42dda72e5;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 9ba82ada5..812a4357d 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,7 @@ file=/var/log/syslog file=/etc/resolv.conf <% if scope.lookupvar('site::nodeinfo')['buildd'] -%> file=/etc/dupload.conf +file=/etc/buildd/buildd.conf <% end -%> file=/etc/resolv.conf.pcmcia.save file=/etc/nologin @@ -368,6 +374,7 @@ file=/etc/apt/sources.list.d/backports.org.list file=/etc/apt/apt.conf.d/local-compression file=/etc/apt/apt.conf.d/local-recommends file=/etc/apt/apt.conf.d/local-pdiffs +file=/etc/apt/apt.conf.d/local-ssl-ca-global file=/etc/apt/preferences.d/buildd file=/etc/systemd/system/puppet.service file=/etc/puppet/puppet.conf @@ -384,6 +391,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 @@ -450,12 +458,20 @@ 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 +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']) %>