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

[Micah Anderson]

The following commit has been merged in the master branch:
commit cae5340e0c8fc9f83412f8a454ed8d8579588283
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Dec 2 19:24:16 2010 -0500

    make puppetqd honor PUPPETQD_OPTS from /etc/default/puppetqd (Closes: #605510)

diff --git a/debian/changelog b/debian/changelog
index 9fc28b5..0431cf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 puppet (2.6.3-2) UNRELEASED; urgency=low
 
+  * Make puppetqd honor flags from /etc/default/puppetqd (Closes: #605510)
   * Remove the puppetqd PID file on stop (Closes: #605512)
   * Add ext/puppetstoredconfigclean to puppetmaster:/usr/sbin
   * Patch ext/logcheck/puppet to handle new puppet-master 
diff --git a/debian/puppetmaster-common.puppetqd.init b/debian/puppetmaster-common.puppetqd.init
index 9cc7f7f..287e25f 100644
--- a/debian/puppetmaster-common.puppetqd.init
+++ b/debian/puppetmaster-common.puppetqd.init
@@ -37,7 +37,7 @@ is_true() {
 start_puppet_queue() {
     if is_true "$PUPPETQD" ; then
 	start-stop-daemon --start --quiet --pidfile=${PIDFILE} \
-	    --startas $DAEMON -- $NAME $DAEMON_OPTS
+	    --startas $DAEMON -- $NAME $DAEMON_OPTS $PUPPETQD_OPTS
     fi
 }
 

-- 
Puppet packaging for Debian