X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=56537e43d2aa785fe2c254316f29426deefc550f;hb=87f172c79bc34b54df8919127862ef3250f29236;hp=b7df1810203409f994266e2cc64ab71fdf33931d;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index b7df18102..56537e43d 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -5,17 +5,18 @@ class ssh {
 	}
 
 	service { 'ssh':
-		ensure => running
+		ensure  => running,
+		require => Package['openssh-server']
 	}
 
 	@ferm::rule { 'dsa-ssh':
 		description => 'Allow SSH from DSA',
-		rule        => '&SERVICE_RANGE(tcp, ssh, \$SSH_SOURCES)'
+		rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_SOURCES)'
 	}
 	@ferm::rule { 'dsa-ssh-v6':
 		description => 'Allow SSH from DSA',
 		domain      => 'ip6',
-		rule        => '&SERVICE_RANGE(tcp, ssh, \$SSH_V6_SOURCES)'
+		rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_V6_SOURCES)'
 	}
 
 	file { '/etc/ssh/ssh_config':
@@ -35,4 +36,18 @@ class ssh {
 	file { '/etc/ssh/userkeys/root':
 		content => template('ssh/authorized_keys.erb'),
 	}
+
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+		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
+			}
+		}
+	}
 }