aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2014-01-07 08:22:27 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2014-01-07 08:22:27 +0000
commitac131f247b8c338fb3925ed1222c2666419fca60 (patch)
tree1993c239e0565c4141a058a2c62e68f98efe2d38 /main
parentdddf224d23d1145b1372c961a4a734071f90b5a3 (diff)
downloadaports-ac131f247b8c338fb3925ed1222c2666419fca60.tar.bz2
aports-ac131f247b8c338fb3925ed1222c2666419fca60.tar.xz
main/zabbix: update init.d
Diffstat (limited to 'main')
-rw-r--r--main/zabbix/APKBUILD15
-rw-r--r--main/zabbix/zabbix-server.confd2
-rw-r--r--main/zabbix/zabbix-server.initd16
3 files changed, 16 insertions, 17 deletions
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 66bcd08795..deebcb2463 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -1,8 +1,9 @@
# Contributor: Jeff Bilyk <jbilyk at gmail>
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zabbix
pkgver=2.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="Enterprise-class open source distributed monitoring"
url="http://www.zabbix.com"
arch="all"
@@ -26,6 +27,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
automake.patch
musl-fix-includes.patch
zabbix-server.initd
+ zabbix-server.confd
zabbix-agentd.initd
zabbix-proxy.initd
"
@@ -98,6 +100,8 @@ package() {
install -D -m0755 "$srcdir"/zabbix-$i.initd \
"$pkgdir"/etc/init.d/zabbix-$i || return 1
done
+ install -D -m0644 "$srcdir"/zabbix-server.confd \
+ "$pkgdir"/etc/conf.d/zabbix-server || return 1
}
setup() {
@@ -177,7 +181,8 @@ md5sums="558497839b13a548f533eb2fc951a4e3 zabbix-2.2.1.tar.gz
b80eca2e260cc9e563f4b7a1b30bb158 res_send.patch
5f7b1815a309d8dade4a1d15d5048742 automake.patch
40c81bdec85815f4ba637eb6528cc5e8 musl-fix-includes.patch
-d823c2ab6c2bbdd0ebd3511fac4a83b4 zabbix-server.initd
+8fe442b55584dd5ba784a3140bb980aa zabbix-server.initd
+bd91d0243cf8f72b86b9bf0b91963663 zabbix-server.confd
1a5c718bcf815fcf659e14fb0b576a1a zabbix-agentd.initd
a99978139481e69434f78fc3e8c53441 zabbix-proxy.initd"
sha256sums="29c9e4cefb527bf929797b26a5a1d8a07c55675bfe6a86ff9ef8e46bd792c7fb zabbix-2.2.1.tar.gz
@@ -189,7 +194,8 @@ d2c0651c5fa67a1857707552e79ecece7ca95c149042460c40456634bf7611dc zabbix-getload
552d14493b97e2ef082d4481bc4b128428ed44d46b63f8dee6e67cf0ab129d19 res_send.patch
4cd7ab9c6fa95aacab0c1f7b77bad18e9b500feca70b16c866a581775b4ad611 automake.patch
38b4e1a5d5c16c7d9b31347acf710d84b693f6e1df365d1072548e897e034884 musl-fix-includes.patch
-f4e18cca40cd7299140aec3077cf39429487860094d7f5d88d76d8e040dca9b8 zabbix-server.initd
+311a29f05a58cfe67c273f7cf25092fab23423feb07e8ee1344141a146f0ccc3 zabbix-server.initd
+ddf75041fb0afc5b211dd79a934341cc9db4325447ad33a42cbf09bdfb5cad42 zabbix-server.confd
4f93c4868726a3e8fed12a030cfce8911f105217a59187d6b3e1565d8d3e76b5 zabbix-agentd.initd
60a01c08df054a0c1bcfb71e378544b4c4e489e6a6779d96383387ed34ddc0b0 zabbix-proxy.initd"
sha512sums="bf897342512c07875b5f473c8b4307d34586306862dd1a31c0bf01776f2c49c066caf3dd95a9bf1ffc9e451733a07a9d9d2acae9f38623a93ad198aef149e1b8 zabbix-2.2.1.tar.gz
@@ -201,6 +207,7 @@ b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700
a2d8d52bacd353363c22f89ca26deffdec722144dab4899987ef4b8479d0b0722007bf3e97f75403e8140153eefac72106985f2bfc0c03ad6d59bc630bf0fd43 res_send.patch
7aa59336e92d83eddff4bc18038820cfc25dc50f45327a2c0a6aa0e360fa742c9724d25e84152e3a14193c88ea5d6e66fdb99f2900c0bf8199cb2adf9e143415 automake.patch
9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91 musl-fix-includes.patch
-af0853d8c5a8b33399b87e7958a7ffd692fe18005dcc43af5f58e0fdf6bbee3dd66ec77a3840ae5e526a4c445b04425071f6796d726ff923aba9d3a78ca3c022 zabbix-server.initd
+790760ddde503b3cf188fbf58e05587756fbf09c4d3cda8493b3b87b44a9a9ed00d4685045f83249c9714bd8afb6a184412ddfff865c073bbed5c513a78ded1c zabbix-server.initd
+a91821c6086a1fc0197750cc68073419defcb7d775b11b14a993409a8f61c7a1a0a0af95de27eed9f3b8357f8362640cb1b26b91b56f4f1d714ca6f222d02b80 zabbix-server.confd
3ef0fe0c1c94f2f01a0c335a45ee0f3c0cd4b125d96b5eefa869a17efb352087a5dd18ef8e87c35e6816b6fb705b829f0a25452e7285637d3595ff4c103b7c21 zabbix-agentd.initd
b305ea06641c6a331273f065a4a85fac92c45e107a30e85cb41be4ea36e2efbf5442c69cc6605ea3734a851808f7abba20042058d4b07832d858cdb63e98d405 zabbix-proxy.initd"
diff --git a/main/zabbix/zabbix-server.confd b/main/zabbix/zabbix-server.confd
new file mode 100644
index 0000000000..3cc9996400
--- /dev/null
+++ b/main/zabbix/zabbix-server.confd
@@ -0,0 +1,2 @@
+pidfile="/var/run/zabbix/zabbix_server.pid"
+command="/usr/sbin/zabbix_server"
diff --git a/main/zabbix/zabbix-server.initd b/main/zabbix/zabbix-server.initd
index 5ccd019430..eee6cb407d 100644
--- a/main/zabbix/zabbix-server.initd
+++ b/main/zabbix/zabbix-server.initd
@@ -1,21 +1,11 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.1 2009/10/05 15:55:23 patrick Exp $
depend() {
need net
use mysql postgresql
+ after firewall
}
-start() {
- ebegin "Starting Zabbix server"
- start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_server
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix server"
- start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_server.pid
- eend $?
+start_pre() {
+ checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
}