Merge commit 'anarcat/master'
This commit is contained in:
commit
5161c4332a
1 changed files with 8 additions and 3 deletions
|
@ -211,12 +211,17 @@ class sshd::base {
|
||||||
notify => Service[sshd],
|
notify => Service[sshd],
|
||||||
}
|
}
|
||||||
# Now add the key, if we've got one
|
# Now add the key, if we've got one
|
||||||
case $sshrsakey_key {
|
case $sshrsakey {
|
||||||
'': { info("no sshrsakey on $fqdn") }
|
'': { warning("no sshrsakey on $fqdn") }
|
||||||
default: {
|
default: {
|
||||||
@@sshkey{"$hostname.$domain":
|
@@sshkey{"$hostname.$domain":
|
||||||
type => ssh-rsa,
|
type => ssh-rsa,
|
||||||
key => $sshrsakey_key,
|
key => $sshrsakey,
|
||||||
|
ensure => present,
|
||||||
|
}
|
||||||
|
@@sshkey{"$ipaddress":
|
||||||
|
type => ssh-rsa,
|
||||||
|
key => $sshrsakey,
|
||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue