From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 08:36:45 +0000 (+0200)
Subject: Continue migrating to /etc/ssh/puppetkeys/ for exported ssh authkeys
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3546510e95c3a75a10c8feebcee7f56a89449d92;p=mirror%2Fdsa-puppet.git

Continue migrating to /etc/ssh/puppetkeys/ for exported ssh authkeys
---

diff --git a/modules/ssh/manifests/authorized_key_collect.pp b/modules/ssh/manifests/authorized_key_collect.pp
index 55eccf656..3e414c032 100644
--- a/modules/ssh/manifests/authorized_key_collect.pp
+++ b/modules/ssh/manifests/authorized_key_collect.pp
@@ -4,11 +4,8 @@ define ssh::authorized_key_collect(
   String $target_user,
   String $collect_tag,
 ) {
-  concat { "/etc/ssh/userkeys/${target_user}": }
-  concat::fragment { "/etc/ssh/userkeys/${target_user}-header":
-    target  => "/etc/ssh/userkeys/${target_user}",
-    order   => '000',
-    content => "# This file is maintained with puppet\n",
+  file { "/etc/ssh/userkeys/${target_user}":
+    ensure => 'absent',
   }
   concat { "/etc/ssh/puppetkeys/${target_user}": }
   concat::fragment { "/etc/ssh/puppetkeys/${target_user}-header":