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

Add variable to control Puppet's own diffing of various files.

Browse source
This commit is contained in:
Ossi Herrala 2012-04-12 09:26:19 +00:00
parent 621b220de2
commit 600548e214
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
puppet/manifests/init.pp
View file

@ -13,6 +13,10 @@ class puppet::client {
$puppet_keylength = "2048" $puppet_keylength = "2048"
} }
if ! $puppet_diffargs {
$puppet_diffargs = "-u"
}
case $operatingsystem { case $operatingsystem {
openbsd: { $vardir = "/var/puppet" } openbsd: { $vardir = "/var/puppet" }
default: { $vardir = "/var/lib/puppet" } default: { $vardir = "/var/lib/puppet" }

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

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