tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed default value for puppet_diffargs

Browse source
This commit is contained in:
Ossi Salmi 2012-04-27 16:17:42 +03:00
parent ca9aa3c997
commit 35c874a59d
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
puppet/templates/puppet.conf.erb
View file

@ -39,9 +39,11 @@
# The bit length of keys.
keylength = <%= puppet_keylength %>
<% if has_variable?("puppet_diffargs") -%>
# Arguments for puppet's use of diff
diff_args = <%= puppet_diffargs %>
<% end -%>
<% if puppetversion[/\d+/].to_i >= 2 -%>
[agent]
# Ignore site manifest when run as agent. Fixes warnings about