[gentoo-commits] gentoo-x86 commit in app-admin/puppet/files: puppetmaster.init puppet.init

[Matsuu Takuto (matsuu)]

matsuu      08/09/09 09:20:06

  Modified:             puppetmaster.init
  Added:                puppet.init
  Log:
  Fixed init.d issue, bug 237071.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64)

Revision  Changes    Path
1.3                  app-admin/puppet/files/puppetmaster.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?r1=1.2&r2=1.3

Index: puppetmaster.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- puppetmaster.init	16 Jun 2008 06:42:46 -0000	1.2
+++ puppetmaster.init	9 Sep 2008 09:20:05 -0000	1.3
@@ -34,7 +34,7 @@
 	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
 
 	ebegin "Starting puppetmaster"
-	start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
+	start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \
 		-- ${options}
 	eend $? "Failed to start puppetmaster"
 }
@@ -48,3 +48,4 @@
 	rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
 	return ${ret}
 }
+



1.1                  app-admin/puppet/files/puppet.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.1&content-type=text/plain

Index: puppet.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v 1.1 2008/09/09 09:20:05 matsuu Exp $

depend() {
        need net
        use dns logger
}

checkconfig() {
        if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
               eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
               return 1
        fi

        return 0
}

start() {
        checkconfig || return $?

        local options=""
        [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"

        ebegin "Starting puppet"
        start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options}
        eend $? "Failed to start puppet"
}

stop() {
        ebegin "Stopping puppet"
        start-stop-daemon --stop --quiet --pidfile ${PUPPET_PID_DIR}/puppetd.pid
        local ret=$?
        eend ${ret} "Failed to stop puppet"
        rm -f ${PUPPET_PID_DIR}/puppetd.pid
        return ${ret}
}