Skip to content

Commit 8b1b7b2

Browse files
mmollekohl
authored andcommitted
add Puppetserver 6.3 auth.conf update
1 parent 81b9ac3 commit 8b1b7b2

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

spec/classes/puppet_server_puppetserver_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,18 @@
426426
end
427427
end
428428

429+
describe 'puppetlabs v4 catalog for services' do
430+
context 'when server_puppetserver_version >= 6.3' do
431+
let(:params) { super().merge(server_puppetserver_version: '6.3.0') }
432+
it { should contain_file(auth_conf).with_content(%r{^(\ *)path: "\^/puppet/v4/catalog/\?\$"$}) }
433+
end
434+
435+
context 'when server_puppetserver_version < 6.3' do
436+
let(:params) { super().merge(server_puppetserver_version: '6.2.0') }
437+
it { should contain_file(auth_conf).without_content(%r{^(\ *)path: "\^/puppet/v4/catalog/\?\$"$}) }
438+
end
439+
end
440+
429441
describe 'when server_puppetserver_version < 5.3.6' do
430442
let(:params) { super().merge(server_puppetserver_version: '5.3.5') }
431443
it { should raise_error(Puppet::Error, /puppetserver <5.3.6 is not supported by this module version/) }

templates/server/puppetserver/conf.d/auth.conf.erb

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,21 @@ authorization: {
1414
}
1515
allow: <%= @server_trusted_agents << '$1' %>
1616
sort-order: 500
17-
name: "puppetlabs catalog"
17+
name: "puppetlabs v3 catalog from agents"
1818
},
19+
<%- if scope.function_versioncmp([@server_puppetserver_version, '6.3.0']) >= 0 -%>
20+
{
21+
# Allow services to retrieve catalogs on behalf of others
22+
match-request: {
23+
path: "^/puppet/v4/catalog/?$"
24+
type: regex
25+
method: post
26+
}
27+
deny: "*"
28+
sort-order: 500
29+
name: "puppetlabs v4 catalog for services"
30+
},
31+
<%- end -%>
1932
{
2033
# Allow nodes to retrieve the certificate they requested earlier
2134
match-request: {

0 commit comments

Comments
 (0)