From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 10:58:15 +0000 (+0200)
Subject: authorized_key_collect: do away with manual ordering, and set ensure_newline on the... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=18e50e16754be8e3fbde0009715aba80ccc1483a;p=mirror%2Fdsa-puppet.git

authorized_key_collect: do away with manual ordering, and set ensure_newline on the concat
---

diff --git a/modules/ssh/manifests/authorized_key_collect.pp b/modules/ssh/manifests/authorized_key_collect.pp
index 48a0790f0..7c121e4e7 100644
--- a/modules/ssh/manifests/authorized_key_collect.pp
+++ b/modules/ssh/manifests/authorized_key_collect.pp
@@ -4,11 +4,9 @@ define ssh::authorized_key_collect(
   String $target_user,
   String $collect_tag,
 ) {
-  concat { "/etc/ssh/puppetkeys/${target_user}": }
-  concat::fragment { "/etc/ssh/puppetkeys/${target_user}-header":
-    target  => "/etc/ssh/puppetkeys/${target_user}",
-    order   => '000',
-    content => "# This file is maintained with puppet\n",
+  concat { "/etc/ssh/puppetkeys/${target_user}":
+    warn           => '# This file is maintained with puppet',
+    ensure_newline => true,
   }
   Concat::Fragment <<| tag == "ssh::authorized_key::fragment::${collect_tag}::${target_user}" |>>