9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [14.0.1](https://github.com/theforeman/puppet-foreman_proxy/tree/14.0.1) (2020-06-15)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/14.0.0...14.0.1)

**Fixed bugs:**

- Fixes [\#30121](https://projects.theforeman.org/issues/30121) - Generate SSH keys in PEM format [\#600](https://github.com/theforeman/puppet-foreman_proxy/pull/600) ([adamruzicka](https://github.com/adamruzicka))
- replace nsupdate dependency on FreeBSD [\#597](https://github.com/theforeman/puppet-foreman_proxy/pull/597) ([fraenki](https://github.com/fraenki))

## [14.0.0](https://github.com/theforeman/puppet-foreman_proxy/tree/14.0.0) (2020-05-16)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/13.0.0...14.0.0)
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
$dhcp_manage_acls = false

$keyfile = '/usr/local/etc/namedb/rndc.key'
$nsupdate = 'bind910'
$nsupdate = 'bind-tools'

$tftp_root = '/tftpboot'
$tftp_syslinux_filenames = [
Expand Down
2 changes: 1 addition & 1 deletion manifests/plugin/remote_execution/ssh.pp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
mode => '0700',
}
-> exec { 'generate_ssh_key':
command => "${ssh_keygen} -f ${ssh_identity_path} -N ''",
command => "${ssh_keygen} -f ${ssh_identity_path} -N '' -m pem",
user => $foreman_proxy::user,
cwd => $ssh_identity_dir,
creates => $ssh_identity_path,
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-foreman_proxy",
"version": "14.0.0",
"version": "14.0.1",
"author": "theforeman",
"summary": "Foreman Smart Proxy configuration",
"license": "GPL-3.0+",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

it 'should configure ssh key' do
should contain_exec('generate_ssh_key').
with_command("/usr/bin/ssh-keygen -f /var/lib/foreman-proxy/ssh/id_rsa_foreman_proxy -N ''")
with_command("/usr/bin/ssh-keygen -f /var/lib/foreman-proxy/ssh/id_rsa_foreman_proxy -N '' -m pem")
end

it { should_not contain_file('/root/.ssh') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/foreman_proxy__spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@
when 'RedHat'
'bind-utils'
when 'FreeBSD', 'DragonFly'
'bind910'
'bind-tools'
else
'dnsutils'
end
Expand Down