diff options
Diffstat (limited to 'community')
| -rw-r--r-- | community/zabbix/APKBUILD | 25 | ||||
| -rw-r--r-- | community/zabbix/zabbix-agentd.initd | 34 |
2 files changed, 16 insertions, 43 deletions
diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index 4e7d79c8e5..89982ec197 100644 --- a/community/zabbix/APKBUILD +++ b/community/zabbix/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zabbix pkgver=4.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" arch="all" @@ -130,7 +130,7 @@ setup() { pkgdesc="Zabbix images and sql files" depends= mkdir -p "$subpkgdir"/usr/share/zabbix - mv "$builddir"/database "$subpkgdir"/usr/share/zabbix/ + cp -r "$builddir"/database "$subpkgdir"/usr/share/zabbix/ } _do_db() { @@ -139,10 +139,10 @@ _do_db() { local i= mkdir -p "$subpkgdir"/usr/sbin if [ "$1" != "sqlite3" ]; then - mv "$builddir-$1"/src/zabbix_server/zabbix_server \ + cp "$builddir-$1"/src/zabbix_server/zabbix_server \ "$subpkgdir"/usr/sbin fi - mv "$builddir-$1"/src/zabbix_proxy/zabbix_proxy \ + cp "$builddir-$1"/src/zabbix_proxy/zabbix_proxy \ "$subpkgdir"/usr/sbin install -D -m0644 "$builddir"/conf/zabbix_proxy.conf \ "$pkgdir"/etc/zabbix/zabbix_proxy.conf @@ -150,7 +150,7 @@ _do_db() { for i in upgrades/dbpatches/*/$1; do [ -e $i ] || continue mkdir -p "$subpkgdir"/usr/share/zabbix/${i%/*} - mv "$i" "$subpkgdir"/usr/share/zabbix/$i + cp "$i" "$subpkgdir"/usr/share/zabbix/$i done return 0 } @@ -163,9 +163,9 @@ utils() { pkgdesc="Zabbix client utilities" depends= mkdir -p "$subpkgdir"/usr/bin - mv "$builddir-postgresql"/src/zabbix_get/zabbix_get \ + cp "$builddir-postgresql"/src/zabbix_get/zabbix_get \ "$subpkgdir"/usr/bin - mv "$builddir-postgresql"/src/zabbix_sender/zabbix_sender \ + cp "$builddir-postgresql"/src/zabbix_sender/zabbix_sender \ "$subpkgdir"/usr/bin } @@ -174,7 +174,7 @@ webif() { depends="$_php_depends" _wwwdir="$subpkgdir"/usr/share/webapps/zabbix mkdir -p $_wwwdir - mv "$builddir"/frontends/php/* "$_wwwdir" + cp -r "$builddir"/frontends/php/* "$_wwwdir" } agent() { @@ -185,8 +185,11 @@ agent() { install -d -m0750 -o zabbix -g zabbix \ "$subpkgdir"/var/run/zabbix "$subpkgdir"/var/log/zabbix mkdir -p "$subpkgdir"/usr/sbin - mv "$builddir-postgresql"/src/zabbix_agent/zabbix_agentd \ + cp "$builddir-postgresql"/src/zabbix_agent/zabbix_agentd \ "$subpkgdir"/usr/sbin + + install -D -m0644 "$builddir"/conf/zabbix_agentd.conf \ + "$subpkgdir"/etc/zabbix/zabbix_agentd.conf } agent_openrc() { @@ -194,8 +197,6 @@ agent_openrc() { depends=openrc install_if="openrc $pkgname-agent=$pkgver-r$pkgrel" - install -D -m0644 "$builddir"/conf/zabbix_agentd.conf \ - "$subpkgdir"/etc/zabbix/zabbix_agentd.conf install -D -m0755 "$srcdir"/zabbix-agentd.initd \ "$subpkgdir"/etc/init.d/zabbix-agentd } @@ -203,7 +204,7 @@ agent_openrc() { sha512sums="021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406 zabbix-4.4.0.tar.gz 9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd 9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd -523013cab3ba79cbc00db92f09d4c5d514fd6aa9cbebf8f29227dc91fbc19d2f8375af74c21d2037e4f3380a818f808194dbc94e69709ef2cf90f66e715895c4 zabbix-agentd.initd +0d50795233ee469e36e9788f8685b16207a37f8a9370e6591688906176e7cb8387ce06f132d7e582a1757fdea7c584a70ccfac39a604da315d71121fa629cbb7 zabbix-agentd.initd a26e7ac422ff60a4b8eed3603022c3a1bde640870bb9286ab061c3cb5c2fd7e91ddb317cb3d1cf61034adda0a080fc212ad416c9e2853a1deb03c5279753f4e2 zabbix-proxy.initd 9fc413b11a01c8202c7ee1c7950d6ca3de2d2d6cd01bea994cd4bc412533b53c4e4b1f58fc3c8df16ea70902053e278e2c5dcc936ce3e0a686a6eac62310ef53 zabbix-getloadavg.patch 7f70dfd602aa164ec8cc65ebb7e8274c685975f6aea9051933928051b8d9b6e368e5a673a07e7084a2105468c5085d72fa7b9f934460f10648d594f28f031a91 automake.patch diff --git a/community/zabbix/zabbix-agentd.initd b/community/zabbix/zabbix-agentd.initd index 56d67db8ae..349b403d69 100644 --- a/community/zabbix/zabbix-agentd.initd +++ b/community/zabbix/zabbix-agentd.initd @@ -1,34 +1,6 @@ #!/sbin/openrc-run -# 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-agentd,v 1.1 2009/10/05 15:55:23 patrick Exp $ - -# ensure the same file is specified as PidFile in /etc/zabbix/zabbix_agentd.conf -pidfile=/var/run/zabbix/zabbix_agentd.pid -user=zabbix -group=zabbix - -start_pre() { - checkpath --owner ${user}:${group} --directory ${pidfile%/*} -} - - -depend() { - need net - provide zabbix-agent - use zabbix-server -} - -start() { - ebegin "Starting Zabbix agent" - start-stop-daemon --pidfile ${pidfile} --start --user ${user}:${group} --exec /usr/sbin/zabbix_agentd - eend $? -} - -stop() { - ebegin "Stopping Zabbix agent" - start-stop-daemon --stop --user ${user} --pidfile ${pidfile} - eend $? -} +command=/usr/sbin/zabbix_agentd +command_args_foreground="-f" +supervisor="supervise-daemon" |