Commit 0c0f93a5 authored by Bill MacAllister's avatar Bill MacAllister
Browse files

ssh: Modify sshd define to support content

It was possible to override the sshd_config file only with a complete
file.  This change allows the sshd_config file to be specified as a
template.
parent 900258a9
UNRELEASED (2015-??-??)
release/004.033 (2015-03-13)
Modify the base::ssh::config::sshd define to allow the
specificaton of content or source. This is required to support
host with special ssh requiremens like systems that use duo. (whm)
Fix a missed hyphen in reference to class fragment-template in
defense.pp. (adamhl)
[dns] Refactor dns into several files and a fix a small typo. (adamhl)
[dns] Refactor dns into several files and a fix a small
typo. (adamhl)
release/004.032 (2015-03-06)
......
......@@ -23,6 +23,7 @@ define base::ssh::config::sshd(
$gitolite = false,
$hostbased = false,
$pubkey = false,
$content = undef,
$source = undef,
$max_tries = 5,
$listen_addresses = 'all',
......@@ -31,7 +32,11 @@ define base::ssh::config::sshd(
if $source {
$template = undef
} else {
$template = template('base/ssh/sshd_config.erb')
if $content {
$template = $content
} else {
$template = template('base/ssh/sshd_config.erb')
}
}
file { $name:
ensure => $ensure,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment