opendev
/
puppet-ssh
Code Issues Proposed changes

Merge "Don't reload ssh service in a chroot"

This commit is contained in:
Jenkins 2015-06-29 17:36:10 +00:00 committed by Gerrit Code Review
parent 6ee3bbd629 8dcdef8e1e
commit b6c6d37948
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@ -5,10 +5,16 @@ class ssh ($trusted_ssh_source = 'puppetmaster.openstack.org') {
package { $::ssh::params::package_name:
ensure => present,
}
service { $::ssh::params::service_name:
ensure => running,
hasrestart => true,
subscribe => File['/etc/ssh/sshd_config'],
if ($::in_chroot) {
notify { 'sshd in chroot':
message => 'sshd not refreshed, running in chroot',
}
} else {
service { $::ssh::params::service_name:
ensure => running,
hasrestart => true,
subscribe => File['/etc/ssh/sshd_config'],
}
}
file { '/etc/ssh/sshd_config':
ensure => present,