File tree Expand file tree Collapse file tree 3 files changed +13
-9
lines changed Expand file tree Collapse file tree 3 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 734734 Optional[Integer[1]] $server_max_open_files = $puppet::params::server_max_open_files ,
735735 Optional[Stdlib::Absolutepath] $server_versioned_code_id = undef ,
736736 Optional[Stdlib::Absolutepath] $server_versioned_code_content = undef ,
737+ Boolean $generate_ca_cert = $puppet::params::generate_ca_cert ,
738+
737739) inherits puppet::params {
738740 contain puppet::config
739741
Original file line number Diff line number Diff line change 3434 $server_compile_mode = undef
3535 $dns_alt_names = []
3636 $use_srv_records = false
37+ $generate_ca_cert = true
3738
3839 if defined (' $::domain' ) {
3940 $srv_domain = $facts [' networking' ][' domain' ]
Original file line number Diff line number Diff line change 164164 $creates = $puppet::server::ssl_cert
165165 $command = " ${puppet::puppet_cmd} cert --generate ${puppet::server::certname} --allow-dns-alt-names"
166166 }
167-
168- exec {'puppet_server_config-generate_ca_cert' :
169- creates => $creates ,
170- command => $command ,
171- umask => ' 0022' ,
172- require => [
173- Concat[" ${puppet::server::dir} /puppet.conf" ],
174- Exec[' puppet_server_config-create_ssl_dir' ],
175- ],
167+ if $puppet::generate_ca_cert {
168+ exec {'puppet_server_config-generate_ca_cert' :
169+ creates => $creates ,
170+ command => $command ,
171+ umask => ' 0022' ,
172+ require => [
173+ Concat[" ${puppet::server::dir} /puppet.conf" ],
174+ Exec[' puppet_server_config-create_ssl_dir' ],
175+ ],
176+ }
176177 }
177178 } elsif $puppet::server::ca_crl_sync {
178179 # If not a ca AND sync the crl from the ca master
You can’t perform that action at this time.
0 commit comments