Make staticsync a module and update references

[mirror/dsa-puppet.git] / modules / staticsync / manifests / ssh.pp

diff --git a/modules/staticsync/manifests/ssh.pp b/modules/staticsync/manifests/ssh.pp
index 22078cb..d3373f0 100644 (file)
--- a/modules/staticsync/manifests/ssh.pp
+++ b/modules/staticsync/manifests/ssh.pp
@@ -1,20 +1,20 @@
 # wrapper for ssh setup for statichosts
-class roles::static::ssh(
+class staticsync::ssh  (
   Variant[Array[String], String] $add_tag,
   String                         $collect_tag,
-  )
-{
-  ssh::keygen {'staticsync': }
+) {
+  ssh::keygen { $staticsync::user : }
 
-  ssh::authorized_key_add { 'staticsync':
-    target_user => 'staticsync',
+  ssh::authorized_key_add { "staticsync-${staticsync::user}":
+    target_user => $staticsync::user,
+    key         => dig($facts, 'ssh_keys_users', $staticsync::user, 'id_rsa.pub', 'line'),
     command     => "/usr/local/bin/staticsync-ssh-wrap ${::fqdn}",
-    key         => $facts['staticsync_key'],
-    options     => ['restrict', 'pty'],
+    options     => ['restrict','pty'],
+    from        => $staticsync::public_addresses,
     collect_tag => $add_tag,
   }
-  ssh::authorized_key_collect { 'staticsync':
-    target_user => 'staticsync',
+  ssh::authorized_key_collect { "staticsync-${staticsync::user}":
+    target_user => $staticsync::user,
     collect_tag => $collect_tag,
   }
 }