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

Finish 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 3e414c032..48a0790f0 100644
--- a/modules/ssh/manifests/authorized_key_collect.pp
+++ b/modules/ssh/manifests/authorized_key_collect.pp
@@ -4,9 +4,6 @@ define ssh::authorized_key_collect(
   String $target_user,
   String $collect_tag,
 ) {
-  file { "/etc/ssh/userkeys/${target_user}":
-    ensure => 'absent',
-  }
   concat { "/etc/ssh/puppetkeys/${target_user}": }
   concat::fragment { "/etc/ssh/puppetkeys/${target_user}-header":
     target  => "/etc/ssh/puppetkeys/${target_user}",