X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=34044c5bbc8c975dd6cbe30feb47d3ba1bd7a063;hb=cbecd0cea6550f8166a5b0db64d83c1f1af462cf;hp=c7c827874c4a318334a25dda057a1e63932131f1;hpb=5d6d2f43b495114f97fb2640124c38d66cc85b60;p=dsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index c7c82787..34044c5b 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 @@ -155,6 +159,7 @@ file=/etc/monit file=/etc/monit/monit.d file=/etc/pam.d file=/etc/schroot/default +file=/etc/schroot/setup.d file=/etc/sysctl.d file=/etc/syslog-ng file=/etc/stunnel @@ -367,6 +372,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 @@ -383,6 +389,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 @@ -414,6 +421,8 @@ file=/etc/cron.d/dsa-buildd file=/etc/cron.weekly/stunnel-ekey-restart file=/etc/default/schroot file=/etc/schroot/default/nssdatabases +file=/etc/schroot/setup.d/99porterbox-extra-sources +file=/etc/schroot/setup.d/99porterbox-extra-apt-options file=/etc/openvswitch/conf.db <% if scope.function_has_role(['nagiosmaster']) -%> @@ -447,8 +456,15 @@ 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