[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.0-2-119-g611c2bb

[Mathias Gug]

The following commit has been merged in the master branch:
commit d678ffffc2a8c685d3917553c42dbb576f7a5604
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Thu Aug 19 18:46:27 2010 -0400

    Move puppetqd init to puppetmaster-common package
    
    Move puppetqd init script and default file to puppetmaster-common
    package since the puppetmaster package will only provide a configuration
    to run puppetmaster with the default webrick server.

diff --git a/debian/puppetmaster-common.puppetqd.default b/debian/puppetmaster-common.puppetqd.default
new file mode 100644
index 0000000..a4c4e3e
--- /dev/null
+++ b/debian/puppetmaster-common.puppetqd.default
@@ -0,0 +1,26 @@
+# Defaults for puppetqd - sourced by /etc/init.d/puppetqd
+
+# 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
+#  [puppetmasterd]
+#  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=""
diff --git a/debian/puppetmaster.puppetqd.init b/debian/puppetmaster-common.puppetqd.init
similarity index 96%
rename from debian/puppetmaster.puppetqd.init
rename to debian/puppetmaster-common.puppetqd.init
index 734446b..9b8c722 100644
--- a/debian/puppetmaster.puppetqd.init
+++ b/debian/puppetmaster-common.puppetqd.init
@@ -16,7 +16,7 @@ PIDFILE="/var/run/puppet/${NAME}"
 
 test -x $DAEMON || exit 0
 
-[ -r /etc/default/puppetmaster ] && . /etc/default/puppetmaster
+[ -r /etc/default/puppetqd ] && . /etc/default/puppetqd
 
 . /lib/lsb/init-functions
 
diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
index 68c58f0..254b030 100644
--- a/debian/puppetmaster.default
+++ b/debian/puppetmaster.default
@@ -36,28 +36,3 @@ 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
-#  [puppetmasterd]
-#  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