← Back to branch summary

~nvalcarcel/ubuntu/lucid/puppet/fix-546677

« back to all changes in this revision

Viewing changes to debian/puppet.init

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/puppet.init
13
13
DAEMON_OPTS=""
14
14
NAME=puppetd
15
15
DESC="puppet configuration management tool"
 
16
PIDFILE="/var/run/${NAME}.pid"
16
17
 
17
18
test -x $DAEMON || exit 0
18
19
 
29
30
}
30
31
 
31
32
reload_puppet() {
32
 
        start-stop-daemon --stop --quiet --signal HUP --pidfile /var/run/puppet/$NAME.pid
 
33
        start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE 
33
34
}
34
35
 
35
36
start_puppet() {
36
37
    if is_true "$START" ; then
37
 
        start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \
 
38
        start-stop-daemon --start --quiet --pidfile $PIDFILE \
38
39
            --startas $DAEMON -- $DAEMON_OPTS
39
40
    else
40
41
        echo ""
43
44
}
44
45
 
45
46
stop_puppet() {
46
 
        start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid
 
47
        start-stop-daemon --stop --quiet --pidfile $PIDFILE
47
48
}
48
49
 
49
 
if [ ! -d /var/run/puppet ]; then
50
 
        rm -rf /var/run/puppet
51
 
        mkdir -p /var/run/puppet
52
 
fi
53
 
 
54
 
chown puppet:puppet /var/run/puppet
55
 
 
56
50
case "$1" in
57
51
    start)
58
52
        log_begin_msg "Starting $DESC"