X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=fc576f82fc7dc0a920862314de4fcbc443e827d5;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=f4e24c2272eabc40088bd2a0031348b13efd5e61;hpb=215ea6ef7a868fe83c46a02fa84a06e3e2631ed6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index f4e24c227..fc576f82f 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -5,7 +5,8 @@ class ssh {
 	}
 
 	service { 'ssh':
-		ensure => running
+		ensure  => running,
+		require => Package['openssh-server']
 	}
 
 	@ferm::rule { 'dsa-ssh':
@@ -35,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
+			}
+		}
+	}
 }