X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=367cae68dc3dda6ae0c9f579436fc124899e4e27;hb=3324b4ae702172197fe7ad725a36f052f1e67c71;hp=e2248f84727deb7c032ae92d57e154997d3b0418;hpb=7ff9a06b9c3affc9eaf3d28f9b8f00f685b7dd9a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index e2248f847..367cae68d 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -1,43 +1,62 @@
 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,
+		mode    => '0755',
+		require => Package['openssh-server']
+	}
+	file { '/etc/ssh/puppetkeys':
 		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',
+		purge   => true,
+		recurse => true,
+		force   => true,
+		source  => 'puppet:///files/empty/',
+		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 (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',
+			}
+		}
 
-        @ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
-        }
-        @ferm::rule { "dsa-ssh-v6":
-                description     => "Allow SSH from DSA",
-                domain          => "ip6",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }"
-        }
+		if $systemd {
+			package { [ 'libpam-systemd' ]:
+				ensure => installed
+			}
+		}
+	}
 }