puppet/ssh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #215 from Arakmar/require_ssh_config

Browse Source 
Make sure the ssh config dir is present before trying to define the known host file.
This commit is contained in:
Garrett Honeycutt 2017-05-19 11:18:21 -04:00 committed by GitHub
commit 7582138819
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -927,11 +927,12 @@ class ssh (
}
file { 'ssh_known_hosts':
ensure => file,
path => $ssh_config_global_known_hosts_file,
owner => $ssh_config_global_known_hosts_owner,
group => $ssh_config_global_known_hosts_group,
mode => $ssh_config_global_known_hosts_mode,
ensure => file,
path => $ssh_config_global_known_hosts_file,
owner => $ssh_config_global_known_hosts_owner,
group => $ssh_config_global_known_hosts_group,
mode => $ssh_config_global_known_hosts_mode,
require => Package[$packages_real],
}
# import all nodes' ssh keys

11
spec/classes/init_spec.rb
View File

@ -235,6 +235,12 @@ describe 'ssh' do
})
}
facts[:ssh_packages].each do |pkg|
it {
should contain_file('ssh_known_hosts').that_requires("Package[#{pkg}]")
}
end
it {
should contain_file('ssh_config').with({
'ensure' => 'file',
@ -1990,6 +1996,7 @@ describe 'ssh' do
'owner' => 'root',
'group' => 'root',
'mode' => '0644',
'require' => ['Package[openssh-server]', 'Package[openssh-clients]'],
})
}
@ -2086,6 +2093,7 @@ describe 'ssh' do
'owner' => 'gh',
'group' => 'root',
'mode' => '0644',
'require' => ['Package[openssh-server]', 'Package[openssh-clients]'],
})
}
end
@ -2112,6 +2120,7 @@ describe 'ssh' do
'owner' => 'root',
'group' => 'gh',
'mode' => '0644',
'require' => ['Package[openssh-server]', 'Package[openssh-clients]'],
})
}
end
@ -2138,6 +2147,7 @@ describe 'ssh' do
'owner' => 'root',
'group' => 'root',
'mode' => '0666',
'require' => ['Package[openssh-server]', 'Package[openssh-clients]'],
})
}
end
@ -2201,6 +2211,7 @@ describe 'ssh' do
'owner' => 'root',
'group' => 'root',
'mode' => '0644',
'require' => ['Package[openssh-server]', 'Package[openssh-clients]'],
})
}
end