Project

General

Profile

« Previous | Next » 

Revision 9f3631ed

Added by Simon Peeters about 8 years ago

split out settings for server

have Concat::Fragment[puppet.conf+15-main-master] contain the master
specific settings for the [main] section

View differences:

templates/puppet.conf.erb
hostprivkey = $privatekeydir/$certname.pem { mode = 640 }
show_diff = <%= scope.lookupvar('::puppet::show_diff') %>
<% if scope.lookupvar('::puppet::server') -%>
reports = <%= scope.lookupvar('::puppet::server_reports') %>
<% end -%>
<% if @module_repository and !@module_repository.empty? -%>
module_repository = <%= @module_repository %>
<% end -%>
......
# Use specified CA port
ca_port = <%= @ca_port %>
<% end -%>
<% if @hiera_config and !@hiera_config.empty? -%>
hiera_config = <%= @hiera_config %>
<% end -%>
<% if @dns_alt_names and !@dns_alt_names.empty? -%>
dns_alt_names = <%= @dns_alt_names.join(",") %>
<% end -%>
......
syslogfacility = <%= @syslogfacility %>
<% end -%>
<% if scope.lookupvar("puppet::server_directory_environments") -%>
environmentpath = <%= scope.lookupvar("puppet::server_envs_dir") %>
basemodulepath = <%= [scope.lookupvar("puppet::server_common_modules_path")].flatten.join(':') %>
<% end -%>
<% scope.lookupvar("puppet::additional_settings").sort_by {|k, v| k}.each do |key, value| -%>
<%= key %> = <%= value %>
<% end -%>
<% if scope.lookupvar("puppet::server_default_manifest") -%>
default_manifest = <%= scope.lookupvar("puppet::server_default_manifest_path") %>
<% end -%>

Also available in: Unified diff