From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 11:58:01 +0000 (+0200)
Subject: bacula_dsa_client_list and tag_bacula_dsa_client_list are not parameters
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=d3e8f7c7ec50ae46c61d229bc950a9c28dd8a9f3

bacula_dsa_client_list and tag_bacula_dsa_client_list are not parameters
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 83d025307..6e9988cc5 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -58,11 +58,9 @@ class bacula::client(
     }
 
     @@concat::fragment { "bacula-dsa-client-list::${client}":
-      target  => $bacula::bacula_dsa_client_list ,
-      content => @("EOF"),
-          ${client}
-          | EOF
       tag     => $bacula::tag_bacula_dsa_client_list,
+      target  => $bacula::bacula_dsa_client_list,
+      content => $client,
     }
 
     # allow access from director
diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 486df2e84..9843e5523 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -148,11 +148,7 @@ class bacula::director(
   }
 
   concat { $bacula::bacula_dsa_client_list:
-  }
-  concat::fragment { 'bacula-dsa-client-list::header' :
-    target  => $bacula::bacula_dsa_client_list,
-    content => '',
-    order   => '00',
+    ensure_newline => true,
   }
   Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
 
diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 013bcf321..36e970b2a 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -12,14 +12,15 @@ class bacula (
   String  $bacula_ssl_server_cert     = '/etc/ssl/debian/certs/thishost-server.crt',
   String  $bacula_ssl_server_key      = '/etc/ssl/private/thishost-server.key',
 
-  String  $bacula_dsa_client_list     = '/etc/bacula/dsa-clients',
-  String  $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist',
-
   Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
 
   Boolean $has_ipv4        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
   Boolean $has_ipv6        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
 ) {
+  # This file is used by our helper scripts on the director
+  $bacula_dsa_client_list     = '/etc/bacula/dsa-clients'
+  $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist'
+
   file { '/usr/local/sbin/bacula-idle-restart':
     mode   => '0555',
     source => 'puppet:///modules/bacula/bacula-idle-restart',