[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-6-90-g53ee498
Stig Sandbeck Mathisen
ssm at debian.org
Tue May 18 09:10:02 UTC 2010
The following commit has been merged in the master branch:
commit 53ee498be3aa6ba3fc3d9b970eafaae00cbfb373
Merge: c8ccd7bbe277e441cb7a0df17304253ffc3445ef cbbd3637142f090aa20d216d3272a062a63bc724
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date: Tue May 18 11:09:21 2010 +0200
Merge branch 'upstream'
Conflicts:
man/man5/puppet.conf.5
man/man8/filebucket.8
man/man8/pi.8
man/man8/puppet.8
man/man8/puppetdoc.8
man/man8/ralsh.8
diff --combined ext/puppetlast
index 7c0c587,7434368..fb99bc7
--- a/ext/puppetlast
+++ b/ext/puppetlast
@@@ -1,4 -1,4 +1,4 @@@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby1.8
# Puppetlast, a script to output the last check-in time of nodes. Also outputs the cached configuration state, if expired or not.
#
# AJ "Fujin" Christensen <aj at junglist.gen.nz>
@@@ -12,5 -12,5 +12,5 @@@ Puppet[:name] = "puppetmasterd
Puppet::Node::Facts.terminus_class = :yaml
Puppet::Node::Facts.search("*").sort { |a,b| a.name <=> b.name }.each do |node|
- puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - Time.parse(node.values[:_timestamp].to_s)) / 60).floor} minutes ago"
+ puts "#{node.name} checked in #{((Time.now - Time.parse(node.values[:_timestamp].to_s)) / 60).floor} minutes ago. Version #{node.values['puppetversion']}#{node.expired? ? ' Cache expired.' : ''}"
end
diff --combined ext/puppetstoredconfigclean.rb
index 978e083,6538192..85e1c0e
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@@ -3,7 -3,7 +3,7 @@@
# Script to clean up stored configs for (a) given host(s)
#
# Credits:
- # Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
+ # Script was taken from http://puppetlabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
# which haven been initially posted by James Turnbull
# duritong adapted and improved the script a bit.
@@@ -66,8 -66,6 +66,8 @@@ case adapte
args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
socket = pm_conf[:dbsocket]
args[:socket] = socket unless socket.to_s.empty?
+ connections = pm_conf[:dbconnections].to_i
+ args[:pool] = connections if connections > 0
else
raise ArgumentError, "Invalid db adapter %s" % adapter
end
diff --combined lib/puppet/defaults.rb
index 736fbee,e446a23..6d0208b
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@@ -16,7 -16,7 +16,7 @@@ module Puppe
else
# Else, use system-wide directories.
conf = "/etc/puppet"
- var = "/var/puppet"
+ var = "/var/lib/puppet"
end
self.setdefaults(:main,
@@@ -149,6 -149,8 +149,8 @@@
huge numbers that can then not be fed back into the system. This is a hackish way to fail in a
slightly more useful way when that happens."],
:node_terminus => ["plain", "Where to find information about nodes."],
+ :catalog_terminus => ["compiler", "Where to get node catalogs. This is useful to change if, for instance,
+ you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
:httplog => { :default => "$logdir/http.log",
:owner => "root",
:mode => 0640,
@@@ -159,9 -161,6 +161,6 @@@
may need to use a FQDN for the server hostname when using a proxy."],
:http_proxy_port => [3128,
"The HTTP proxy port to use for outgoing connections"],
- :http_enable_post_connection_check => [true,
- "Boolean; whether or not puppetd should validate the server
- SSL certificate against the request hostname."],
:filetimeout => [ 15,
"The minimum time to wait (in seconds) between checking for updates in
configuration files. This timeout determines how quickly Puppet checks whether
@@@ -292,7 -291,9 +291,9 @@@
:owner => "service",
:desc => "Where the host's certificate revocation list can be found.
This is distinct from the certificate authority's CRL."
- }
+ },
+ :certificate_revocation => [true, "Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL)
+ to all clients. If enabled, CA chaining will almost definitely not work."]
)
setdefaults(:ca,
@@@ -451,12 -452,12 +452,12 @@@
directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
:ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
client's SSL DN. Only used with Mongrel. This header must be set by the proxy
- to the authenticated client's SSL DN (e.g., ``/CN=puppet.reductivelabs.com``).
- See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
+ to the authenticated client's SSL DN (e.g., ``/CN=puppet.puppetlabs.com``).
+ See http://puppetlabs.com/puppet/trac/wiki/UsingMongrel for more information."],
:ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
message of the client verification. Only used with Mongrel. This header must be set by the proxy
to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
- See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
+ See http://puppetlabs.com/puppet/trac/wiki/UsingMongrel for more information."],
# To make sure this directory is created before we try to use it on the server, we need
# it to be in the server section (#1138).
:yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
@@@ -559,6 -560,10 +560,10 @@@
new configurations, where you want to fix the broken configuration
rather than reverting to a known-good one."
],
+ :use_cached_catalog => [false,
+ "Whether to only use the cached catalog rather than compiling a new catalog
+ on every run. Puppet can be run with this enabled by default and then selectively
+ disabled when a recompile is desired."],
:ignorecache => [false,
"Ignore cache and always recompile the configuration. This is
useful for testing new configurations, where the local cache may in
@@@ -629,7 -634,7 +634,7 @@@
# Central fact information.
self.setdefaults(:main,
- :factpath => {:default => "$vardir/facts/",
+ :factpath => {:default => "$vardir/lib/facter/:$vardir/facts",
:desc => "Where Puppet should look for facts. Multiple directories should
be colon-separated, like normal PATH variables.",
:call_on_define => true, # Call our hook with the default value, so we always get the value added to facter.
@@@ -670,17 -675,14 +675,17 @@@
:dbadapter => [ "sqlite3", "The type of database to use." ],
:dbmigrate => [ false, "Whether to automatically migrate the database." ],
:dbname => [ "puppet", "The name of the database to use." ],
- :dbserver => [ "localhost", "The database server for Client caching. Only
+ :dbserver => [ "localhost", "The database server for caching. Only
used when networked databases are used."],
- :dbuser => [ "puppet", "The database user for Client caching. Only
+ :dbuser => [ "puppet", "The database user for caching. Only
used when networked databases are used."],
- :dbpassword => [ "puppet", "The database password for Client caching. Only
+ :dbpassword => [ "puppet", "The database password for caching. Only
used when networked databases are used."],
:dbsocket => [ "", "The database socket location. Only used when networked
databases are used. Will be ignored if the value is an empty string."],
+ :dbconnections => [ 0, "The number of database connections. Only used when
+ networked databases are used. Will be ignored if the value is an empty
+ string or is less than 1."],
:railslog => {:default => "$logdir/rails.log",
:mode => 0600,
:owner => "service",
@@@ -727,7 -729,7 +732,7 @@@
setdefaults(:ldap,
:ldapnodes => [false,
"Whether to search for node configurations in LDAP. See
- http://reductivelabs.com/trac/puppet/wiki/LDAPNodes for more information."],
+ http://puppetlabs.com/trac/puppet/wiki/LDAPNodes for more information."],
:ldapssl => [false,
"Whether SSL should be used when searching for nodes.
Defaults to false because SSL usually requires certificates
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list