Revision 23978618
Added by Dominic Cleal almost 10 years ago
| templates/server/puppet.conf.erb | ||
|---|---|---|
|
|
||
|
<% if scope.lookupvar("puppet::server_directory_environments") -%>
|
||
|
environmentpath = <%= scope.lookupvar("puppet::server_envs_dir") %>
|
||
|
basemodulepath = <%= [scope.lookupvar("puppet::server_common_modules_path")].flatten.join(':') %>
|
||
|
<% elsif scope.lookupvar("puppet::server_git_repo") ||
|
||
|
scope.lookupvar("puppet::server_dynamic_environments") -%>
|
||
|
manifest = <%= scope.lookupvar("puppet::server_envs_dir") %>/$environment/manifests/site.pp
|
||
|
modulepath = <%= scope.lookupvar("puppet::server_envs_dir") %>/$environment/modules
|
||
|
<% end -%>
|
||
|
<% if scope.lookupvar("puppet::server_git_repo") ||
|
||
|
scope.lookupvar("puppet::server_dynamic_environments") -%>
|
||
|
config_version = <%= scope.lookupvar("puppet::server::config_version_cmd") %>
|
||
|
<% end -%>
|
||
Also available in: Unified diff
fixes #4700 - deploy directory environments on Puppet 3.6 or higher
- $server_dynamic_environments is deprecated when server_directory_environments
is enabled, set $server_environments = [] instead for a similar effect
- environment.conf deployed if custom manifest, config_version etc supplied to
puppet::server::env instead of puppet.conf fragment
- basemodulepath set in puppet.conf to the value of server_common_modules_path,
which had /etc/puppet/modules added to match the new Puppet default
- $environment_timeout added to puppet::server::env