[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.3-1-7-g4c88b74

[Micah Anderson]

The following commit has been merged in the master branch:
commit e62a7007637d758ff2387c9c5d03651f75edffe4
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Dec 2 18:59:58 2010 -0500

    update documentation to match new section headings
    
    Conflicts:
    
    	debian/changelog
    	debian/puppetmaster.README.debian
    	debian/puppetmaster.default

diff --git a/debian/changelog b/debian/changelog
index 7b9897f..d5f78fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ puppet (2.6.3-2) UNRELEASED; urgency=low
   * Add ext/puppetstoredconfigclean to puppetmaster:/usr/sbin
   * Patch ext/logcheck/puppet to handle new puppet-master 
     Compiled log lines (Closes: #602336)
+  * Fix puppetqd initscript PID location
+  * Fix /etc/default/puppetmaster comments to match new section headings
+  * Fix puppetmaster/README.Debian to match new section headings
 
  -- Micah Anderson <micah at debian.org>  Mon, 29 Nov 2010 11:11:02 -0500
 
diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
index 254b030..b0a9fe4 100644
--- a/debian/puppetmaster.default
+++ b/debian/puppetmaster.default
@@ -36,3 +36,28 @@ PUPPETMASTERS=1
 # port 8140 and change the below number to something else, such as
 # 18140.
 PORT=8140
+
+# Should puppetqd (the storeconfigs queuing broker) be started? 
+#  This can take some load off of the puppetmaster by queuing the
+#  storeconfig updates to the database with puppetqd. You need
+#  to have the 'stompserver' package installed and running, and
+#  the following configured in your puppet.conf:
+#
+#  [main]
+#  queue_type = stomp
+#  queue_source = stomp://localhost:61613
+#  dbadapter = (sqlite3|mysql|postgresql)
+#  dbserver=localhost
+#  dbname=puppet
+#  dbuser=puppet
+#  dbpassword=xxxx
+#  dblocation = /var/lib/puppet/storeconfigs.sqlite <-- only if using sqlite
+#  [master]
+#  async_storeconfigs = true
+#
+#  See: http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
+#
+#  Once you have the proper puppet.conf, and stompserver, you can enable
+#  the following:
+PUPPETQD=no
+PUPPETQD_OPTS=""

-- 
Puppet packaging for Debian