From: Peter Palfrader Date: Mon, 8 Jan 2018 09:55:56 +0000 (+0100) Subject: samhain ignore /etc/quagga/bgpd.conf and /etc/quagga/zebra.conf X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=25a153ebac03385a69fe864e4e1b017bc63f5777;p=mirror%2Fdsa-puppet.git samhain ignore /etc/quagga/bgpd.conf and /etc/quagga/zebra.conf --- diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index ddc9e3861..b2be07aac 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -114,6 +114,12 @@ file=/etc/static-clients.conf file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf <% end -%> file=/etc/multipath/wwids +<%- if has_variable?("bgpd") && @bgpd -%> +file=/etc/quagga/bgpd.conf +<% end -%> +<%- if has_variable?("zebra") && @zebra -%> +file=/etc/quagga/zebra.conf +<% end -%> # # There are files in /etc that might change, thus changing the directory