← Back to branch summary

~ubuntu-branches/ubuntu/precise/puppet/precise-proposed

« back to all changes in this revision

Viewing changes to debian/puppetmaster-common.puppetqd.init

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-02-08 00:28:43 UTC
  • mfrom: (1.1.22 upstream) (3.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20110208002843-1xrv7w3vqblrn15m
Tags: 2.6.4-2ubuntu1
https://launchpad.net/bugs/641001
* Merge from debian unstable.  Remaining changes:
  - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
    set the location of the CRL in apache2 configuration. Fix apache2 
    configuration on upgrade as well (LP: #641001)
  - move all puppet dependencies to puppet-common since all the code 
    actually located in puppet-common.
  - move libagueas from a recommend to a dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/puppetmaster-common.puppetqd.init
12
12
DAEMON_OPTS="queue"
13
13
NAME=queue
14
14
DESC="puppet queue"
15
 
PIDFILE="/var/run/puppet/${NAME}"
 
15
PIDFILE="/var/run/puppet/${NAME}.pid"
16
16
 
17
17
test -x $DAEMON || exit 0
18
18
 
37
37
start_puppet_queue() {
38
38
    if is_true "$PUPPETQD" ; then
39
39
        start-stop-daemon --start --quiet --pidfile=${PIDFILE} \
40
 
            --startas $DAEMON -- $NAME $DAEMON_OPTS
 
40
            --startas $DAEMON -- $NAME $DAEMON_OPTS $PUPPETQD_OPTS
41
41
    fi
42
42
}
43
43
 
44
44
stop_puppet_queue() {
45
45
    start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}
 
46
    rm -f ${PIDFILE}
46
47
}
47
48
 
48
49
status_puppet_queue() {