Project

General

Profile

« Previous | Next » 

Revision 57a8b959

Added by Mickaël Canévet about 9 years ago

Use puppetlabs-concat instead of theforeman-concat_native

View differences:

manifests/server/config.pp
$server_node_terminus = 'plain'
}
concat_fragment { 'puppet.conf+30-master':
concat::fragment { 'puppet.conf+30-master':
target => "${::puppet::dir}/puppet.conf",
content => template($puppet::server_template),
order => '30',
}
## If the ssl dir is not the default dir, it needs to be created before running
......
exec {'puppet_server_config-generate_ca_cert':
creates => $::puppet::server::ssl_cert,
command => "${puppet::params::puppetca_path}/${puppet::params::puppetca_bin} --generate ${::fqdn}",
require => File["${puppet::server_dir}/puppet.conf"],
require => Concat["${puppet::server_dir}/puppet.conf"],
}
if $puppet::server_passenger and $::puppet::server_implementation == 'master' {

Also available in: Unified diff