X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=dd34a154ae959cb0c14966f11fecda79c499466a;hb=21d1febc6387b3c00d006ce354782a37889a372e;hp=34044c5bbc8c975dd6cbe30feb47d3ba1bd7a063;hpb=cbecd0cea6550f8166a5b0db64d83c1f1af462cf;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 34044c5bb..dd34a154a 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -110,6 +110,9 @@ file=/etc/static-clients.conf <% elsif classes.include?("roles::static_source") -%> file=/etc/static-clients.conf <% end -%> +<% if classes.include?("apache2") -%> +file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf +<% end -%> file=/etc/multipath/wwids # @@ -126,9 +129,11 @@ 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 +<% if classes.include?("apache2") -%> +file=/etc/apache2/conf-available files=/etc/apache2/mods-enabled files=/etc/apache2/sites-available +<% end -%> file=/etc/bacula file=/etc/samhain file=/etc/munin @@ -174,6 +179,13 @@ file=/etc/rabbitmq file=/etc/ssh/userkeys file=/etc/ssh/userkeys/staticsync <% end -%> +file=/etc/rsyncd +<%- if hostname == "sibelius" then -%> +file=/etc/tsm +file=/etc/tsm/TSM.PWD +<% end -%> +file=/etc/ssl/private + [LogFiles] ## @@ -239,6 +251,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 @@ -374,7 +388,6 @@ 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 file=/etc/default/puppet file=/etc/default/postgrey @@ -411,7 +424,6 @@ 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/monit/monit.d/01puppet @@ -469,6 +481,7 @@ 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']) %> @@ -484,6 +497,7 @@ dir=1/usr/share/puppet-dashboard/tmp/pids <% if classes.include?("porterbox") %> file=/etc/cron.weekly/puppet-mail-big-homedirs <% end -%> +file=/etc/ssl/private/*.key-certchain [IgnoreNone] ##