X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=fc576f82fc7dc0a920862314de4fcbc443e827d5;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=98add73820e1f33154cb8361eed03c1f61812c61;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 98add7382..fc576f82f 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -1,46 +1,53 @@
 class ssh {
-	package {
-                openssh-client: ensure => installed;
-                openssh-server: ensure => installed;
-        }
 
-	file { "/etc/ssh/ssh_config":
-		source  => [ "puppet:///ssh/ssh_config" ],
-		require => Package["openssh-client"]
-                ;
-	       "/etc/ssh/sshd_config":
-		content => template("ssh/sshd_config.erb"),
-		require => Package["openssh-server"],
-                notify  => Exec["ssh restart"]
-                ;
-              "/etc/ssh/userkeys":
+	package { [ 'openssh-client', 'openssh-server']:
+		ensure => installed
+	}
+
+	service { 'ssh':
+		ensure  => running,
+		require => Package['openssh-server']
+	}
+
+	@ferm::rule { 'dsa-ssh':
+		description => 'Allow SSH from DSA',
+		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)'
+	}
+
+	file { '/etc/ssh/ssh_config':
+		content => template('ssh/ssh_config.erb'),
+		require => Package['openssh-client']
+	}
+	file { '/etc/ssh/sshd_config':
+		content => template('ssh/sshd_config.erb'),
+		require => Package['openssh-server'],
+		notify  => Service['ssh']
+	}
+	file { '/etc/ssh/userkeys':
 		ensure  => directory,
-		owner   => root,
-		group   => root,
-		mode    => 755,
-                ;
-              "/etc/ssh/userkeys/root":
-                content => template("ssh/authorized_keys.erb"),
-                mode    => 444,
-                require => Package["openssh-server"]
-                ;
+		mode    => '0755',
+		require => Package['openssh-server']
+	}
+	file { '/etc/ssh/userkeys/root':
+		content => template('ssh/authorized_keys.erb'),
 	}
 
-        exec { "ssh restart":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true,
-        }
+	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',
+			}
+		}
 
-        @ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                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)"
-        }
+		if $systemd {
+			package { [ 'libpam-systemd' ]:
+				ensure => installed
+			}
+		}
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: