ssh: fix errors in template path

parent 78926682
......@@ -45,7 +45,7 @@
# If you set this to true you should also set $pubkey to true.
#
# Example:
# root_authorized_keys => template('mymodule/root/.ssh/authorized_keys.erb'),
# root_authorized_keys => 'mymodule/root/.ssh/authorized_keys.erb',
#
# Default: undef
......@@ -138,7 +138,7 @@ class base::ssh(
if ($root_authorized_keys) {
file { '/root/.ssh/authorized_keys':
ensure => present,
content => $root_authorized_keys,
content => template($root_authorized_keys),
mode => '0640',
}
} else {
......
......@@ -34,19 +34,19 @@ define base::ssh::config::sshd(
$hostbased = false,
$pubkey = false,
$password = true,
$content = undef,
$source = undef,
$template_path = undef,
$max_tries = 5,
$listen_addresses = 'all',
$listen_ports = '22',
$rootloginwithpswd = 'no',
$pam_duo = false,
) {
if $source {
if ($source) {
$template = undef
} else {
if $content {
$template = $content
if ($template_path) {
$template = template($template_path)
} else {
$template = template('base/ssh/sshd_config.erb')
}
......
Markdown is supported
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