diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-08-17 23:44:43 -0300 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-08-18 08:06:06 +0000 |
| commit | dd4dc354e08af00d720754f8533c5c5c2bd766db (patch) | |
| tree | e54a84ecfc537c0c626693e2ec21f5f4accf99f3 | |
| parent | 45a5aa61dc68ec9e358720a6fb965e8e3875da54 (diff) | |
| download | aports-dd4dc354e08af00d720754f8533c5c5c2bd766db.tar.bz2 aports-dd4dc354e08af00d720754f8533c5c5c2bd766db.tar.xz | |
main/monit: upgrade to 5.26.0
Closes GH-10179
| -rw-r--r-- | main/monit/APKBUILD | 12 | ||||
| -rw-r--r-- | main/monit/monit.initd | 29 |
2 files changed, 19 insertions, 22 deletions
diff --git a/main/monit/APKBUILD b/main/monit/APKBUILD index 4abf2d700d..ff300f7dba 100644 --- a/main/monit/APKBUILD +++ b/main/monit/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=monit -pkgver=5.25.3 +pkgver=5.26.0 pkgrel=0 pkgdesc="Managing and monitoring on a UNIX system" url="https://mmonit.com/monit/" @@ -11,8 +11,8 @@ license="AGPL-3.0-or-later" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-doc $pkgname-openrc" source="https://mmonit.com/monit/dist/monit-$pkgver.tar.gz - $pkgname.initd" -builddir="$srcdir"/$pkgname-$pkgver + $pkgname.initd + " build() { cd "$builddir" @@ -35,7 +35,7 @@ check() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm 755 "$srcdir"/$pkgname.initd \ + install -Dm 755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname install -Dm 644 "$builddir"/monitrc \ "$pkgdir"/etc/monitrc @@ -48,5 +48,5 @@ package() { chmod 600 "$pkgdir"/etc/monitrc } -sha512sums="9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90 monit-5.25.3.tar.gz -94d67a995c6028d48cb729a60157ab42f2a3c15d59284f1de56c35b44bf83929ba9c42a5cbfe3bb4df0def70465cf3dff0ad6e532b6a02805840dc57785e1cc9 monit.initd" +sha512sums="ae5bfc9f2e8cf2d2efa7a121f3bb865dc5b66b647e23e005349799f3f4384dfa1534ed88d0767ca41dac4cea2674fb82cfb51098129d350b470143df548c6900 monit-5.26.0.tar.gz +688711432aa072bf9a6fe55cec0202d54a5fac9a421efd41ebe3974e843f41a076945e65b3b53f968926e037ecb54049f42d99dc7a1a9f35a7e6d19ca5a4f019 monit.initd" diff --git a/main/monit/monit.initd b/main/monit/monit.initd index 0866f69b03..e241677440 100644 --- a/main/monit/monit.initd +++ b/main/monit/monit.initd @@ -3,6 +3,15 @@ # Distributed under the terms of the GNU General Public License, v2 or later # $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $ +supervisor=supervise-daemon + +name="monit" +description="Monit service supervisor" + +command=/usr/bin/monit +command_args="-c ${CONF:-/etc/monitrc}" +command_args_foreground="-I" + extra_commands="configtest" extra_started_commands="reload" @@ -11,29 +20,17 @@ depend() { } configtest() { - /usr/bin/monit -t 1>/dev/null 2>&1 + /usr/bin/monit -t -c "$CONF" 1>/dev/null 2>&1 ret=$? if [ $ret -ne 0 ]; then - eerror "${SVCNAME} has detected an error in your setup:" - /usr/bin/monit -t + eerror "${RC_SVCNAME} has detected an error in your setup:" + /usr/bin/monit -t "$CONF" fi return $ret } -start() { - ebegin "Starting monit" - start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping monit" - start-stop-daemon --stop --quiet --exec /usr/bin/monit - eend $? -} - reload() { ebegin "Reloading monit" - /usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1 + $command -c "$CONF" reload >/dev/null 2>&1 eend $? } |