Skip to content

Commit f99fa45

Browse files
baurmattekohl
authored andcommitted
Add ability to configure custom_trusted_oid_mapping.yaml
This commit adds support to configure the $confdir/custom_trusted_oid_mapping.yaml as described in https://puppet.com/docs/puppet/5.5/config_file_oid_map.html. Fixes theforemanGH-602.
1 parent c01d2a8 commit f99fa45

File tree

6 files changed

+266
-210
lines changed

6 files changed

+266
-210
lines changed

manifests/init.pp

+4
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,9 @@
473473
# can query the certificate-status endpoint
474474
# Defaults to [ '127.0.0.1', '::1', $::ipaddress ]
475475
#
476+
# $server_custom_trusted_oid_mapping:: A hash of custom trusted oid mappings. Defaults to undef
477+
# Example: { 1.3.6.1.4.1.34380.1.2.1.1 => { shortname => 'myshortname' } }
478+
#
476479
# $server_admin_api_whitelist:: The whitelist of clients that
477480
# can query the puppet-admin-api endpoint
478481
# Defaults to [ '127.0.0.1', '::1', $::ipaddress ]
@@ -632,6 +635,7 @@
632635
Optional[Boolean] $server_crl_enable = $puppet::params::server_crl_enable,
633636
Boolean $server_ca_auth_required = $puppet::params::server_ca_auth_required,
634637
Array[String] $server_ca_client_whitelist = $puppet::params::server_ca_client_whitelist,
638+
Optional[Puppet::Custom_trusted_oid_mapping] $server_custom_trusted_oid_mapping = $puppet::params::server_custom_trusted_oid_mapping,
635639
Boolean $server_http = $puppet::params::server_http,
636640
Integer $server_http_port = $puppet::params::server_http_port,
637641
Array[String] $server_http_allow = $puppet::params::server_http_allow,

manifests/params.pp

+1
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
# Override these if you need your own hooks
281281
$server_post_hook_content = 'puppet/server/post-receive.erb'
282282
$server_post_hook_name = 'post-receive'
283+
$server_custom_trusted_oid_mapping = undef
283284

284285
# PuppetDB config
285286
$server_puppetdb_host = undef

0 commit comments

Comments
 (0)