switch weblogsync to other ssh facter
authorPeter Palfrader <peter@palfrader.org>
Sat, 14 Sep 2019 21:46:48 +0000 (23:46 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 14 Sep 2019 21:46:48 +0000 (23:46 +0200)
modules/debian_org/lib/facter/roleaccounts.rb
modules/roles/manifests/weblog_provider.pp

index 63bc161..6b3d4db 100644 (file)
@@ -10,7 +10,6 @@ begin
        letsencrypt
        portforwarder
        postgres
-       weblogsync
        }.each do |user|
         Facter.add("#{user}_user_exists") do
             setcode do
index c37a03a..bed4aac 100644 (file)
@@ -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',
   }