cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XXX use pkill -9 in rc_stop for now; when puppetd is started then

Browse Source 
stopped when puppetmasterd is not available it would fail to stop within
at least 60 seconds.

discussed with and ok robert@ (maintainer)
This commit is contained in:
ajacoutot 2012-01-18 14:47:04 +00:00
parent 82918e4d22
commit 9a811ec508
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/ruby-puppet/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2011/11/24 18:45:14 robert Exp $
# $OpenBSD: Makefile,v 1.38 2012/01/18 14:47:04 ajacoutot Exp $
COMMENT= centralised configuration management for networks
VERSION= 2.7.5
DISTNAME= puppet-${VERSION}
PKGNAME= ruby-${DISTNAME}
REVISION= 1
REVISION= 2
CATEGORIES= sysutils net
HOMEPAGE= http://reductivelabs.com/projects/puppet/

8
sysutils/ruby-puppet/pkg/puppetd.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: puppetd.rc,v 1.1 2011/03/20 15:46:34 ajacoutot Exp $
# $OpenBSD: puppetd.rc,v 1.2 2012/01/18 14:47:05 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/puppetd"
@ -9,4 +9,10 @@ daemon="${TRUEPREFIX}/sbin/puppetd"
pexp=".*ruby.* ${daemon}${daemon_flags:+ ${daemon_flags}}"
rc_reload=NO
# XXX can't stop within a fair amount of time when puppetmasterd is unreachable;
# related to: http://projects.puppetlabs.com/issues/11360 ?
rc_stop() {
pkill -9 -f "^${pexp}"
}
rc_cmd $1