[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Nick Lewis]

The following commit has been merged in the experimental branch:
commit 68b1404804d239670092a40607eacbf03757ba16
Merge: a32bd16c6f3311c3f836346ac17ce80c777ac85f b753d836c5ea18333a1199b20b5c495f562f2af4
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Wed Nov 17 15:33:00 2010 -0800

    Merge branch 'ticket/next/5288' into next

diff --combined lib/puppet/defaults.rb
index c4d8d51,50c5d8c..45152f2
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@@ -116,7 -116,7 +116,7 @@@ module Puppe
      :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."],
      :facts_terminus => {
-       :default => Puppet.application_name.to_s == "master" ? 'yaml' : 'facter', 
+       :default => Puppet.application_name.to_s == "master" ? 'yaml' : 'facter',
        :desc => "The node facts terminus.",
        :hook => proc do |value|
          require 'puppet/node/facts'
@@@ -599,7 -599,7 +599,7 @@@
      :inventory_port => ["$masterport",
        "The port to communicate with the inventory_server."
      ],
-     :report => [false,
+     :report => [true,
        "Whether to send reports after every transaction."
      ],
      :graph => [false, "Whether to create dot graph files for the different
@@@ -656,7 -656,7 +656,7 @@@
      setdefaults(
      :tagmail,
      :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags and email addresses."],
 -    :sendmail => [%x{which sendmail 2>/dev/null}.chomp, "Where to find the sendmail binary with which to send email."],
 +    :sendmail => [which('sendmail') || '', "Where to find the sendmail binary with which to send email."],
  
      :reportfrom => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."), "The 'from' email address for the reports."],
      :smtpserver => ["none", "The server through which to send email reports."]
@@@ -682,10 -682,11 +682,10 @@@
        used when networked databases are used."],
      :dbpassword => [ "puppet", "The database password for caching. Only
        used when networked databases are used."],
 +    :dbconnections => [ '', "The number of database connections for networked
 +      databases.  Will be ignored unless the value is a positive integer."],
      :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",

-- 
Puppet packaging for Debian