Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #325, ticket_salt ist stored to api.conf only if pki = none|ca #370

Merged
merged 1 commit into from
Sep 6, 2017
Merged

fix #325, ticket_salt ist stored to api.conf only if pki = none|ca #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,8 @@ This host will be connected to request the certificate. Set this if you use the
Port of the 'ca_host'. Defaults to `5665`

##### `ticket_salt`
Salt to use for ticket generation. Defaults to icinga2 constant `TicketSalt`.
Salt to use for ticket generation. The salt is stored to api.conf if `none` or `ca` is chosen for `pki`.
Defaults to constant `TicketSalt`.

##### `endpoints`
Hash to configure endpoint objects. Defaults to `{ 'NodeName' => {} }`. `NodeName` is a Icinga 2 constant.
Expand Down
5 changes: 3 additions & 2 deletions examples/init_master.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
}
}

class { '::icinga2::pki::ca': }

class { '::icinga2::feature::api':
pki => 'none',
zones => {
Expand All @@ -17,3 +15,6 @@
},
}
}

class { '::icinga2::pki::ca': }

14 changes: 12 additions & 2 deletions manifests/feature/api.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
# Port of the 'ca_host'. Defaults to 5665
#
# [*ticket_salt*]
# Salt to use for ticket generation. Defaults to icinga2 constant TicketSalt.
# Salt to use for ticket generation. The salt is stored to api.conf if none or ca is chosen for pki.
# Defaults to constant TicketSalt.
#
# [*endpoints*]
# Hash to configure endpoint objects. Defaults to { 'NodeName' => {} }.
Expand Down Expand Up @@ -242,6 +243,8 @@
# handle the certificate's stuff
case $pki {
'puppet': {
$_ticket_salt = undef

file { $_ssl_key_path:
ensure => file,
mode => $_ssl_key_mode,
Expand All @@ -263,6 +266,10 @@
} # puppet

'none': {
# non means you manage the CA on your own and so
# the salt has to be stored in api.conf
$_ticket_salt = $ticket_salt

if $ssl_key {
$_ssl_key = $::osfamily ? {
'windows' => regsubst($ssl_key, '\n', "\r\n", 'EMG'),
Expand Down Expand Up @@ -305,6 +312,8 @@
} # none

'icinga2': {
$_ticket_salt = undef

validate_string($ca_host)
validate_integer($ca_port)

Expand Down Expand Up @@ -333,6 +342,7 @@
} # icinga2

'ca': {
$_ticket_salt = $ticket_salt
class { '::icinga2::pki::ca': }

warning('This parameter is deprecated and will be removed in future versions! Please use ::icinga2::pki::ca instead')
Expand All @@ -346,7 +356,7 @@
ca_path => $_ssl_cacert_path,
accept_commands => $accept_commands,
accept_config => $accept_config,
ticket_salt => $ticket_salt,
ticket_salt => $_ticket_salt,
tls_protocolmin => $ssl_protocolmin,
cipher_list => $ssl_cipher_list,
bind_host => $bind_host,
Expand Down
4 changes: 2 additions & 2 deletions manifests/pki/ca.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
include ::icinga2::params
require ::icinga2::config

$bin_dir = $::icinga2::params::bin_dir
$ca_dir = $::icinga2::params::ca_dir
$pki_dir = $::icinga2::params::pki_dir
$user = $::icinga2::params::user
Expand All @@ -76,8 +77,7 @@
}

Exec {
user => 'root',
path => $::path,
path => $bin_dir,
}

if $ssl_key_path {
Expand Down
12 changes: 5 additions & 7 deletions spec/classes/api_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
.with({ 'target' => '/etc/icinga2/features-available/api.conf' })
.with_content(/accept_config = false/)
.with_content(/accept_commands = false/)
.with_content(/ticket_salt = TicketSalt/)
.without_content(/bind_\w+ =/)
}

Expand Down Expand Up @@ -228,8 +227,8 @@
end


context "#{os} with ticket_salt => foo" do
let(:params) { {:ticket_salt => 'foo'} }
context "#{os} with pki => none, ticket_salt => foo" do
let(:params) { {:pki => 'none', :ticket_salt => 'foo'} }

it { is_expected.to contain_concat__fragment('icinga2::object::ApiListener::api')
.with({ 'target' => '/etc/icinga2/features-available/api.conf' })
Expand Down Expand Up @@ -347,8 +346,7 @@
it { is_expected.to contain_concat__fragment('icinga2::object::ApiListener::api')
.with({ 'target' => 'C:/ProgramData/icinga2/etc/icinga2/features-available/api.conf' })
.with_content(/accept_config = false/)
.with_content(/accept_commands = false/)
.with_content(/ticket_salt = TicketSalt/) }
.with_content(/accept_commands = false/) }

it { is_expected.to contain_file('C:/ProgramData/icinga2/etc/icinga2/pki/host.example.org.key') }
it { is_expected.to contain_file('C:/ProgramData/icinga2/etc/icinga2/pki/host.example.org.crt') }
Expand Down Expand Up @@ -498,8 +496,8 @@
end


context "Windows 2012 R2 with ticket_salt => foo" do
let(:params) { {:ticket_salt => 'foo'} }
context "Windows 2012 R2 with pki => none, ticket_salt => foo" do
let(:params) { {:pki => 'none', :ticket_salt => 'foo'} }

it { is_expected.to contain_concat__fragment('icinga2::object::ApiListener::api')
.with({ 'target' => 'C:/ProgramData/icinga2/etc/icinga2/features-available/api.conf' })
Expand Down