From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 21:46:48 +0000 (+0200)
Subject: switch weblogsync to other ssh facter
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2835c1daf1a5f55ec56366fa5d534b6bfc7728cb;p=mirror%2Fdsa-puppet.git

switch weblogsync to other ssh facter
---

diff --git a/modules/debian_org/lib/facter/roleaccounts.rb b/modules/debian_org/lib/facter/roleaccounts.rb
index 63bc161b2..6b3d4db4f 100644
--- a/modules/debian_org/lib/facter/roleaccounts.rb
+++ b/modules/debian_org/lib/facter/roleaccounts.rb
@@ -10,7 +10,6 @@ begin
        letsencrypt
        portforwarder
        postgres
-       weblogsync
        }.each do |user|
         Facter.add("#{user}_user_exists") do
             setcode do
diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp
index c37a03a61..bed4aaca4 100644
--- a/modules/roles/manifests/weblog_provider.pp
+++ b/modules/roles/manifests/weblog_provider.pp
@@ -3,8 +3,8 @@ class roles::weblog_provider {
   ssh::keygen {'weblogsync': }
   ssh::authorized_key_add { 'weblongsync-provider::destination':
     target_user => 'weblogsync',
+    key         => dig($facts, 'ssh_keys_users', 'weblogsync', 'id_rsa.pub', 'line'),
     command     => "/srv/weblogs.debian.org/bin/ssh-wrap ${::fqdn}",
-    key         => $facts['weblogsync_key'],
     collect_tag => 'weblogsync',
   }