projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
retire ravel
[mirror/dsa-puppet.git]
/
modules
/
ssh
/
manifests
/
init.pp
diff --git
a/modules/ssh/manifests/init.pp
b/modules/ssh/manifests/init.pp
index
4d40154
..
8e61da6
100644
(file)
--- a/
modules/ssh/manifests/init.pp
+++ b/
modules/ssh/manifests/init.pp
@@
-1,8
+1,5
@@
class ssh {
class ssh {
- #nodes = hiera('nodes', nil, {'cluster' => hiera('cluster')})
- #$rootkeys = nodes.collect{|x| hiera('rootkey', nil, {'hostname' => x})}
-
package { [ 'openssh-client', 'openssh-server']:
ensure => installed
}
package { [ 'openssh-client', 'openssh-server']:
ensure => installed
}
@@
-39,4
+36,12
@@
class ssh {
file { '/etc/ssh/userkeys/root':
content => template('ssh/authorized_keys.erb'),
}
file { '/etc/ssh/userkeys/root':
content => template('ssh/authorized_keys.erb'),
}
+
+ if ($::lsbmajdistrelease >= 8) {
+ if ! $has_etc_ssh_ssh_host_ed25519_key {
+ exec { 'create-ed25519-host-key':
+ command => 'ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -q -P "" -t ed25519',
+ }
+ }
+ }
}
}