From 2ce069f10fbc19e4e67059872d9bf1ed37ab1ca7 Mon Sep 17 00:00:00 2001 From: Michael Dodwell Date: Fri, 23 May 2014 14:02:29 +1000 Subject: [PATCH] Update puppet.conf.erb Settings are deprecated. See http://links.puppetlabs.com/env-settings-deprecations --- templates/server/puppet.conf.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/server/puppet.conf.erb b/templates/server/puppet.conf.erb index 4003055..a2f0702 100644 --- a/templates/server/puppet.conf.erb +++ b/templates/server/puppet.conf.erb @@ -4,7 +4,7 @@ vardir = <%= scope.lookupvar('puppet::data_dir') %> logdir = <%= scope.lookupvar('puppet::log_dir') %> rundir = <%= scope.lookupvar('puppet::run_dir') %> - templatedir = <%= scope.lookupvar('puppet::template_dir') %> + #templatedir = <%= scope.lookupvar('puppet::template_dir') %> ssldir = <%= scope.lookupvar('puppet::ssl_dir') %> usecacheonfailure = true user = <%= scope.lookupvar('puppet::process_user_server') %> @@ -78,8 +78,8 @@ <% end -%> environment = <%= scope.lookupvar('puppet::environment') %> - manifest = <%= scope.lookupvar('puppet::manifest_path') %> - modulepath = <%= scope.lookupvar('puppet::module_path') %> + #manifest = <%= scope.lookupvar('puppet::manifest_path') %> + #modulepath = <%= scope.lookupvar('puppet::module_path') %> <% if scope.lookupvar('puppet::dns_alt_names') != '' -%> dns_alt_names = <%= scope.lookupvar('puppet::dns_alt_names') %>