aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Puppetfile_extras4
-rw-r--r--manifests/profile/base/sshd.pp56
-rw-r--r--releasenotes/notes/sshd-437c531301f458bb.yaml4
-rw-r--r--spec/classes/tripleo_profile_base_sshd_spec.rb62
4 files changed, 88 insertions, 38 deletions
diff --git a/Puppetfile_extras b/Puppetfile_extras
index 50a9294..10425cc 100644
--- a/Puppetfile_extras
+++ b/Puppetfile_extras
@@ -36,3 +36,7 @@ mod 'ntp',
mod 'systemd',
:git => 'https://github.com/camptocamp/puppet-systemd',
:ref => 'master'
+
+mod 'ssh',
+ :git => 'https://github.com/saz/puppet-ssh',
+ :ref => 'v3.0.1'
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'
+ }
}
}
diff --git a/releasenotes/notes/sshd-437c531301f458bb.yaml b/releasenotes/notes/sshd-437c531301f458bb.yaml
index 0086cb0..5997289 100644
--- a/releasenotes/notes/sshd-437c531301f458bb.yaml
+++ b/releasenotes/notes/sshd-437c531301f458bb.yaml
@@ -1,3 +1,5 @@
---
features:
- - Added manifest and template to enable configuration of sshd_config
+ - Added /etc/issue & /etc/issue.net parameters
+ - Added MOTD banner parameters
+ - Added external module saz-ssh to allow management of sshd_config
diff --git a/spec/classes/tripleo_profile_base_sshd_spec.rb b/spec/classes/tripleo_profile_base_sshd_spec.rb
index 210b41c..c611fe9 100644
--- a/spec/classes/tripleo_profile_base_sshd_spec.rb
+++ b/spec/classes/tripleo_profile_base_sshd_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2016 Red Hat, Inc.
+# Copyright 2017 Red Hat, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,18 +13,64 @@
# License for the specific language governing permissions and limitations
# under the License.
#
+# Unit tests for tripleo::profile::base::sshd
+#
require 'spec_helper'
describe 'tripleo::profile::base::sshd' do
- context 'with banner configured' do
- it do
- is_expected.to contain_file('/etc/issue').with({
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0600',
- })
+ shared_examples_for 'tripleo::profile::base::sshd' do
+
+ context 'it should do nothing' do
+ it do
+ is_expected.to contain_class('ssh')
+ is_expected.to_not contain_file('/etc/issue')
+ is_expected.to_not contain_file('/etc/issue.net')
+ is_expected.to_not contain_file('/etc/motd')
+ end
+ end
+
+ context 'with issue and issue.net configured' do
+ let(:params) {{ :bannertext => 'foo' }}
+ it do
+ is_expected.to contain_file('/etc/issue').with({
+ 'content' => 'foo',
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ })
+ is_expected.to contain_file('/etc/issue.net').with({
+ 'content' => 'foo',
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ })
+ is_expected.to_not contain_file('/etc/motd')
+ end
+ end
+
+ context 'with motd configured' do
+ let(:params) {{ :motd => 'foo' }}
+ it do
+ is_expected.to contain_file('/etc/motd').with({
+ 'content' => 'foo',
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ })
+ is_expected.to_not contain_file('/etc/issue')
+ is_expected.to_not contain_file('/etc/issue.net')
+ end
+ end
+ end
+
+ on_supported_os.each do |os, facts|
+ context "on #{os}" do
+ let (:facts) {
+ facts
+ }
+ it_behaves_like 'tripleo::profile::base::sshd'
end
end
end