Skip to content

Commit 64354d5

Browse files
committed
Manage ssh dir param
1 parent 0e51d99 commit 64354d5

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

manifests/bolt/master.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
Boolean $create_bolt_user = true,
1717
Boolean $run_ssh_keygen = true,
1818
String $fact_template = 'psick/bolt/bolt_user_key.sh.erb',
19+
Boolean $manage_ssh_dir = true,
1920

2021
# Management of hostkeys
2122
Boolean $manage_host_key = $psick::bolt::manage_host_key,
@@ -89,7 +90,8 @@
8990
false => undef,
9091
}
9192

92-
if $run_ssh_keygen or $psick::bolt::bolt_user_pub_key {
93+
if ($run_ssh_keygen or $psick::bolt::bolt_user_pub_key)
94+
and $manage_ssh_dir {
9395
file { "${user_home_dir}/.ssh" :
9496
ensure => $dir_ensure,
9597
mode => '0700',

manifests/bolt/node.pp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
String $sudo_template = 'psick/bolt/user/sudo.erb',
1010

1111
Boolean $manage_host_key = $psick::bolt::manage_host_key,
12+
Boolean $manage_ssh_dir = true,
1213

1314
Boolean $manage = $psick::manage,
1415
Boolean $noop_manage = $psick::noop_manage,
@@ -41,12 +42,14 @@
4142
password => $user_password,
4243
}
4344

44-
file { "${user_home_dir}/.ssh" :
45-
ensure => $dir_ensure,
46-
mode => '0700',
47-
owner => $psick::bolt::ssh_user,
48-
group => $psick::bolt::ssh_group,
49-
require => User[$psick::bolt::ssh_user],
45+
if $manage_ssh_dir {
46+
file { "${user_home_dir}/.ssh" :
47+
ensure => $dir_ensure,
48+
mode => '0700',
49+
owner => $psick::bolt::ssh_user,
50+
group => $psick::bolt::ssh_group,
51+
require => User[$psick::bolt::ssh_user],
52+
}
5053
}
5154
}
5255

0 commit comments

Comments
 (0)