]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
Merge branch 'master' into 'master'
authorng <ng+gitlab@immerda.ch>
Sat, 17 Jan 2015 09:52:07 +0000 (09:52 +0000)
committerng <ng+gitlab@immerda.ch>
Sat, 17 Jan 2015 09:52:07 +0000 (09:52 +0000)
Fix for Debian squeeze and ssh_keygen for Puppet < 3 installs

Facter versions that are shipping in Debian squeeze and wheezy do not support the operatingsystemmajrelease core fact, which appears only from facter 1.7 onwards.

This isn't a big problem for wheezy since the openssh-server version it ships supports multiple AuthorizedKeysFile file paths,

On Debian squeeze, openssh-server does NOT support multuple AuthorizedKeysFile and will refuse to start with such a definition.

ALSO:

`ssh_keygen` is currently broken for Puppet 2.7.x clients. This commit should resolve the issue.

The fix was suggested by @ng in reference to https://github.com/duritong/puppet-sysctl/blob/master/lib/puppet/provider/sysctl_runtime/sysctl_runtime.rb#L16-L17

See merge request !3


Trivial merge