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

Fix restart for server and proxy by tweaking pexp.

Browse Source 
These can take a couple of seconds to shutdown while leaving a non-matching
process.

ok robert@ (maintainer)
This commit is contained in:
ajacoutot 2012-01-20 10:40:42 +00:00
parent 77ba76861b
commit d967637ec2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/zabbix/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2012/01/11 22:28:19 sthen Exp $ # $OpenBSD: Makefile,v 1.68 2012/01/20 10:40:42 ajacoutot Exp $
COMMENT-main = network and application monitoring - agent COMMENT-main = network and application monitoring - agent
COMMENT-server = network and application monitoring - server COMMENT-server = network and application monitoring - server
@ -14,6 +14,7 @@ FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net CATEGORIES = net
REVISION-main = 0 REVISION-main = 0
REVISION-server = 0
REVISION-web = 0 REVISION-web = 0
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/} MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

4
net/zabbix/pkg/zabbix_proxy.rc
View File

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
# #
# $OpenBSD: zabbix_proxy.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $ # $OpenBSD: zabbix_proxy.rc,v 1.6 2012/01/20 10:40:42 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/zabbix_proxy" daemon="${TRUEPREFIX}/sbin/zabbix_proxy"
. /etc/rc.d/rc.subr . /etc/rc.d/rc.subr
pexp="zabbix_proxy: heartbeat sender" pexp="zabbix_proxy"
rc_reload=NO rc_reload=NO
rc_pre() { rc_pre() {

4
net/zabbix/pkg/zabbix_server.rc
View File

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
# #
# $OpenBSD: zabbix_server.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $ # $OpenBSD: zabbix_server.rc,v 1.6 2012/01/20 10:40:42 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/zabbix_server" daemon="${TRUEPREFIX}/sbin/zabbix_server"
. /etc/rc.d/rc.subr . /etc/rc.d/rc.subr
pexp="zabbix_server: main process" pexp="zabbix_server"
rc_reload=NO rc_reload=NO
rc_pre() { rc_pre() {