ssh authkeys: Put hostname in exported ferm rule
authorPeter Palfrader <peter@palfrader.org>
Sat, 7 Sep 2019 21:54:40 +0000 (23:54 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 7 Sep 2019 21:54:40 +0000 (23:54 +0200)
modules/ssh/manifests/authorized_key_add.pp

index a4d0d95..6c644c0 100644 (file)
@@ -23,7 +23,7 @@ define ssh::authorized_key_add(
   $from_space = $from_hosts.join(' ')
 
   if $key {
-    @@concat::fragment { "ssh::authorized_key::${name} ${target_user} ${from}":
+    @@concat::fragment { "ssh::authorized_key::${name} ${target_user} from ${::hostname}":
       tag     => "ssh::authorized_key::fragment::${collect_tag}::${target_user}",
       target  => "/etc/ssh/userkeys/${target_user}",
       order   => '200',
@@ -35,7 +35,7 @@ define ssh::authorized_key_add(
     notify{ "Warning, ssh key for ${name}, ${target_user} not defined (yet?).": }
   }
 
-  @@ferm::rule { "ssh-${collect_tag}_${target_user}-${name}":
+  @@ferm::rule { "ssh-${collect_tag}_${target_user}-${name}_from_${::hostname}":
     tag         => "ssh::authorized_key::ferm::${collect_tag}::${target_user}",
     description => "allow ssh for ssh to ${target_user}",
     domain      => '(ip ip6)',