commit: 21db5496bfd5cc77395acae854025818dbd9d644
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 08:02:12 2018 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Jun 3 08:02:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21db5496
app-admin/aerospike-amc-community: Fix init script
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-admin/aerospike-amc-community/Manifest | 1 -
.../aerospike-amc-community-3.6.13.ebuild | 63 ----------------------
...ld => aerospike-amc-community-4.0.19-r1.ebuild} | 2 +-
.../aerospike-amc-community-4.0.19.ebuild | 24 ---------
.../files/{amc.init.3 => amc.init.4} | 5 +-
5 files changed, 2 insertions(+), 93 deletions(-)
diff --git a/app-admin/aerospike-amc-community/Manifest
b/app-admin/aerospike-amc-community/Manifest
index 69a1f3701c3..a2242f18258 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,3 +1,2 @@
DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B
cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828
SHA512
8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
-DIST aerospike-amc-community-4.0.17.tar.gz 7868123 BLAKE2B
86ada2e5af69b9306dc10b5386d21bd4459fff8a05672f289511f1b4efc27b1bd114cdd7bf9e5d6656fa3911ca111c8eabaa178a564f2ff9e6ab64c4a88a0145
SHA512
3dce8e8d435f70685498083d50818c1655faa61125391424c0ff99ea50618df4f9f3c3ddc7be5c64aba7118e75c5c3f24f7c5bfe834ba7fb504fa7d72bd00db3
DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B
69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf
SHA512
821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
diff --git
a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
deleted file mode 100644
index 5e04b68567f..00000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition
Server"
-HOMEPAGE="http://www.aerospike.com";
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
- dev-python/eventlet
- dev-python/flask
- dev-python/greenlet
- dev-python/setproctitle
- www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- default
- mkdir "${P}"
- tar -xf data.tar.xz -C "${S}" || die
- tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
- mv opt/amc/amc/* opt/amc/
- rm -rf opt/amc/amc
- rm -f opt/amc/install
- rm -f opt/amc/bin/uninstall
- rm -f opt/amc/bin/amc_*.sh
- rm -f opt/amc/bin/gunicorn
- rm -rf opt/amc/server/site-packages/
- rm -rf opt/amc/server/setups/
-
- insinto /etc/logrotate.d
- newins opt/amc/config/logrotate amc
- rm -f opt/amc/config/logrotate
-
- insinto /etc/cron.daily
- newins opt/amc/config/logcron amc
- rm -f opt/amc/config/logcron
-
- sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i
opt/amc/config/gunicorn_config.py || die
-
- insinto /etc/amc/config
- doins -r opt/amc/config/*
- rm -rf opt/amc/config/
-
- echo "${PV}" > opt/amc/amc_version
-
- insinto /opt/amc/
- doins -r opt/amc/*
-
- keepdir /var/log/amc
-
- newinitd "${FILESDIR}"/amc.init amc
-}
diff --git
a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
similarity index 92%
rename from
app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
rename to
app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
index ee583da80e5..d1d21c1ab7b 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
@@ -20,5 +20,5 @@ S=$WORKDIR
src_install() {
cp -r "$S/"* "$D"
rm "${D}/etc/init.d/*"
- newinitd "${FILESDIR}/amc.init.3" amc
+ newinitd "${FILESDIR}/amc.init.4" amc
}
diff --git
a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
deleted file mode 100644
index ee583da80e5..00000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition
Server"
-HOMEPAGE="http://www.aerospike.com";
-SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux ->
${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S=$WORKDIR
-
-src_install() {
- cp -r "$S/"* "$D"
- rm "${D}/etc/init.d/*"
- newinitd "${FILESDIR}/amc.init.3" amc
-}
diff --git a/app-admin/aerospike-amc-community/files/amc.init.3
b/app-admin/aerospike-amc-community/files/amc.init.4
similarity index 89%
rename from app-admin/aerospike-amc-community/files/amc.init.3
rename to app-admin/aerospike-amc-community/files/amc.init.4
index 6fd8097b18f..87405a83c70 100644
--- a/app-admin/aerospike-amc-community/files/amc.init.3
+++ b/app-admin/aerospike-amc-community/files/amc.init.4
@@ -11,11 +11,8 @@ pidfile=${run_dir}/${SVCNAME}.pid
user=${user:-root}
group=${group:-root}
start_stop_daemon_args="--user ${user} --group ${group}"
+command_args="--daemon"
depend() {
use net
}
-
-start_post() {
- ewaitfile 60 "${pidfile}"
-}
