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
Show stats Download patch file Download diff file Expand all files Collapse all files

15
puppet/manifests/init.pp
View file

@ -1,6 +1,17 @@
# Install and configure Puppet client. # Install and configure Puppet client.
# #
# === Global variables
#
# $puppet_server:
# Hostname of puppet server. Defaults to 'puppet'.
#
# $puppet_keylength:
# Length of client keys. Defaults to 2048.
#
# $puppet_diffargs:
# Arguments for puppet's use of diff. Unset by default.
#
class puppet::client { class puppet::client {
tag("bootstrap") tag("bootstrap")
@ -13,10 +24,6 @@ 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" }

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

@ -39,9 +39,11 @@
# The bit length of keys. # The bit length of keys.
keylength = <%= puppet_keylength %> keylength = <%= puppet_keylength %>
<% if has_variable?("puppet_diffargs") -%>
# Arguments for puppet's use of diff # Arguments for puppet's use of diff
diff_args = <%= puppet_diffargs %> diff_args = <%= puppet_diffargs %>
<% end -%>
<% 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