From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sun, 12 Jan 2014 09:50:46 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5073d030cdafeabd6ac44a4ba571811b806140d2;hp=55eb28d2776ddeabd4249bb286b420d3c33a6dbe;p=dsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 99e5f5a2..ee11c515 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -291,6 +291,7 @@ file=/etc/multipath.conf
 file=/etc/static-components.conf
 file=/etc/rabbitmq/rabbitmq.config
 dir=/etc/bacula/storages-list.d
+dir=/etc/bacula/storage-conf.d
 dir=/etc/bacula/conf.d
 <%=
 out=""