From b35bc80ac2acf18463e4c18c8360862749aa0964 Mon Sep 17 00:00:00 2001
From: lhinds <lhinds@redhat.com>
Date: Wed, 8 Mar 2017 12:32:57 +0000
Subject: SSHD Service extensions

This change adds an `include` statement to bring in the extra
functionality available from the existing puppet-ssh module in
already available in RDO.

By using puppet-ssh it provides a framework to allow the passing in of
server options using just hiera values under ssh::server_options.
For example, sshd_config banner can now be passed a server option, as
well as all the new parameters outlined in the launchpad issue that
the patch references for Closing. For this reason, the former augeas
setting for `Banner /etc/issue` is now managed by the main puppet-ssh
module instead.

The change also allows population of MOTD text to `/etc/motd` as
well as `issue.net`.

$bannertext is refactored in accordance with patch [1]

[1] https://review.openstack.org/#/c/442406/

Change-Id: Id329538fb7b623526f1d91d8a513cf3440c86a7c
Closes-Bug: 1668543
---
 manifests/profile/base/sshd.pp | 56 ++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

(limited to 'manifests/profile')

diff --git a/manifests/profile/base/sshd.pp b/manifests/profile/base/sshd.pp
index e7916c1..f43089c 100644
--- a/manifests/profile/base/sshd.pp
+++ b/manifests/profile/base/sshd.pp
@@ -15,47 +15,45 @@
 #
 # == Class: tripleo::profile::base::sshd
 #
-# SSH profile for tripleo
+# SSH composable service for TripleO
 #
 # === Parameters
 #
 # [*bannertext*]
-#   The text used within SSH Banner
+#   The text used within /etc/issue and /etc/issue.net
 #   Defaults to hiera('BannerText')
 #
+# [*motd*]
+#   The text used within SSH Banner
+#   Defaults to hiera('MOTD')
+#
 class tripleo::profile::base::sshd (
   $bannertext = hiera('BannerText', undef),
+  $motd = hiera('MOTD', undef),
 ) {
 
-  if $bannertext {
-    $action = 'set'
-  } else {
-    $action = 'rm'
-  }
-
-  package {'openssh-server':
-    ensure => installed,
-  }
+  include ::ssh
 
-  augeas { 'sshd_config_banner':
-    context => '/files/etc/ssh/sshd_config',
-    changes => [ "${action} Banner /etc/issue"  ],
-    notify  => Service['sshd']
-  }
-
-  file { '/etc/issue':
-    ensure  => file,
-    backup  => false,
-    content => $bannertext,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600'
+  if $bannertext {
+    $filelist = [ '/etc/issue', '/etc/issue.net', ]
+    file { $filelist:
+      ensure  => file,
+      backup  => false,
+      content => $bannertext,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644'
+    }
   }
 
-  service { 'sshd':
-    ensure    => 'running',
-    enable    => true,
-    hasstatus => false,
-    require   => Package['openssh-server'],
+  if $motd {
+    file { '/etc/motd':
+      ensure  => file,
+      backup  => false,
+      content => $motd,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644'
+    }
   }
 }
-- 
cgit 1.2.3-korg