X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=d86093ef347e658258c5861f266af8de9c2966e8;hb=c8eb6ea612404c681f42a310bad33b094c92eb3b;hp=455d32208d2471b2400426735165c22110c34d70;hpb=e1f71e92e65b162bf75157c44ad15b6a2bdfb85b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 455d32208..d86093ef3 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -1,8 +1,5 @@
 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
 	}
@@ -39,4 +36,18 @@ class ssh {
 	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',
+			}
+		}
+
+		if $systemd {
+			package { [ 'libpam-systemd' ]:
+				ensure => installed
+			}
+		}
+	}
 }