app-admin/scylla-manager-agent: switch to scylla-manager user

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

4 files changed, 18 insertions, 73 deletions

diff --git a/app-admin/scylla-manager-agent/Manifest b/app-admin/scylla-manager-agent/Manifest
index b777147..811b7bf 100644
--- a/app-admin/scylla-manager-agent/Manifest
+++ b/app-admin/scylla-manager-agent/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX scylla-manager-agent.initd 755 BLAKE2B 3e7f53f21944774af391cba38117f695ebd5722bc9c7be7ba7bf5fb017a9cd03ddf735660f305a45c3094c2ed25d9a508a3465f465079b1a94cb07ad9d59492b SHA512 cbeb529bf7ae7a9d74631ae0169676126338f90bbf2ed58c46693046d160981d076cc8f5cbdfd3d6bc3d736541fefd16f968c807a81587a7a952a9b39c1e0124
-DIST scylla-manager-agent-2.1.0-0.20200611.9be1c609.x86_64.rpm 12554832 BLAKE2B 6cb55b231f768ac6a9f73106b9c042fd3593908047ec93218eaa24b722209027971974a5d36db7e0bcb0505ed3f567571d8eda00c1dd57338764f71f34342e7d SHA512 420d9e170e7b0d978efd8fc1a7774b8359f7b3d756fb4a8ae823e3cdbcfc14bc26b31dc99d699a189fa6a2b609b7dd10024fca3852dfe2e73a11afc2a0f80599
+AUX scylla-manager-agent.initd 771 BLAKE2B ea62fae48341e8bcd4cceb6466e13643b108e23a3ca9e63bf78abe23cfab951cb10452141cd94f536313e3a0b6ce2115193b1efc527154c0d0581188ba1c6596 SHA512 cbf87c357a72247b17c774d0c71531db32396d2d7f248516bf60289f33dffc54cefb35844291c9a9c3c3a4e4e70c79ee815f5d3c440e14f786433ddc69a6e4b6
 DIST scylla-manager-agent-2.1.2-0.20200816.76cc4dcc.x86_64.rpm 12555372 BLAKE2B 9fb8839094f7a20a4393ec588c1a3bb09131ac1a364600acdab0e85d5e2ac8ad476fa9aa8028d199b0582c52bc37cbc43a41698adb7d8f863e110e42c7e682e1 SHA512 bacc8cc537c03bfa21e836c8f5cb9614fbcf82ef3dcc7098815da63a2245383c3f9cefc7182dc1ce144e3cdade83fd3c45404ce98a1e774de0c462ad0f3fe14a
-EBUILD scylla-manager-agent-2.1.0.ebuild 1100 BLAKE2B e251e04ba6d590c871900ff3e24f88dc50bac94ed9435d516fbdfdb8c407e8d2f8cef7b5008797a7e0596da96d8f7bcd025ed3c26bb1c94a57ed2e50e7cb5eb7 SHA512 e26318a55a9edc225c9ca2376a4ae60cad58f37f3c991654c302231200dc8aee2a15a28e7d6667724cf4b3d61213636c88fc217b505412680570ada1dcf02796
-EBUILD scylla-manager-agent-2.1.2.ebuild 1324 BLAKE2B 23007eb0bb53e84719de91b2fbfa27f373ce9381b826c802ae2f43c09b93b8512745756116f9f3b438140735cbe73ea7c94339f6c3098a9414a21664a1668c77 SHA512 d510472d43f26f192700e35ee1012a9dd05f224b4c22225226e62107e86e9cad47b277f2042c9c2451a9fb9aeefa00a8a59fa6bb8dac020e4b30e4917ce54ba4
+EBUILD scylla-manager-agent-2.1.2.ebuild 1273 BLAKE2B ff955ae97e98e4fae535094acfe2787c09cbaa274b6b3fc8b1a32832ac1fe7bd486e832cfead49fcf7c6d0034f4209d817a8cfb2541b43a723914e03d1349f0e SHA512 b77dd0cb9001cc701a9d6f1da0105acc7c8e59af70d03299e3dd3cc6afc65e1227ce84d5f794bd9ec60f565866bd3664b5800ea539f7f50931d61f5c974bb838
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl9h9ldfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl9h+PFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy+nNAf6AtS7X/2H8OLH1ZjS8nLizLJXTrbj6mJoPch/I68DrMhGIcDoZo+v/ytr
-M32hy3PRp4F/vp0v1U2qiS91+RVbQAppr6dh8qqLcY5B4wHGjIqW24QyRt2j5rAV
-9DXUEQfPNhhMGzBMlzgLtczcNRjVPUAmeG8sBCHUWacKkkPDG465L9RFa1m211XR
-CYSSiJcDjzqLFg8+lkZNVMZuayROMTXI2KDmFY76ElWcCajpNPYLr2U4IACXud7a
-Fim62WQeGkEdIbZvpgFj3jPq5BMoK2NXOHaPEahmsU7GgMURtmUUYuwdp4SCbxLO
-+lvcZuNxwB4LwNRe17mQVsPQ2hky+w==
-=olb6
+dy8T0Af+P9HnbGf/4PzXcxscjGw46VfWl234Q7lNPPKcz9U5iz1Du1mVc4T2w8xx
+XKN9M82dXk86CEnGHoSzq8aAMmqHvihyokzUA+VPadNDvnhIUVTm2Ct58Dt4Vbwu
+mX5nipPLqUArmSBCOCON2aAqVqOIM1tkO5NaUYZoJ1cKdDuQfO8lyQVcZmigPUp0
+4CNJDRbBTtx+robSMd6b47bZwqaTBv7FN7OxCHTF95CZs8/Lp9Mthm+OxZXdhg5q
+k8TWObkM8g0kqr+E0EvBQIn0qAK7Z0v/JdPKR56xa+EwLGQ/C5kpuxcXG7cqfxvw
+yfy0sBeRn+iIp2l/I/nOTPQrqvZopw==
+=URLi
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-manager-agent/files/scylla-manager-agent.initd b/app-admin/scylla-manager-agent/files/scylla-manager-agent.initd
index 7ddfe7f..e7bcca0 100644
--- a/app-admin/scylla-manager-agent/files/scylla-manager-agent.initd
+++ b/app-admin/scylla-manager-agent/files/scylla-manager-agent.initd
@@ -10,8 +10,8 @@ command_args=""
 command_background="true"
 command_progress="true"
 pidfile=${run_dir}/${SVCNAME}.pid
-user=${USER:-scylla}
-group=${GROUP:-scylla}
+user=${USER:-scylla-manager}
+group=${GROUP:-scylla-manager}
 retry="SIGTERM/120"
 start_stop_daemon_args="--user ${user} --group ${group}"
 
diff --git a/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.0.ebuild b/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.0.ebuild
deleted file mode 100644
index f678ccd..0000000
--- a/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_V="2.1.0-0.20200611.9be1c609"
-
-DESCRIPTION="Scylla Manager Agent"
-HOMEPAGE="https://docs.scylladb.com/operating-scylla/manager/2.0/install-agent"
-SRC_URI="${PN}-${MY_V}.x86_64.rpm"
-
-LICENSE="SCYLLADB-PROPRIETARY"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	app-arch/rpm2targz
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="fetch"
-S=${WORKDIR}
-
-src_unpack() {
-	for rpm in ${A}; do
-		rpmunpack "${DISTDIR}/${rpm}" || die
-	done
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/scylla-manager
-	fowners scylla:scylla "/var/lib/scylla-manager"
-
-	insinto /etc
-	doins -r */etc/*
-
-	rm -rf */usr/share || die
-
-	insinto /usr
-	doins -r */usr/*
-
-	fperms +x /usr/bin/scylla-manager-agent
-	fperms +x /usr/lib/scylla-manager/scyllamgr_agent_setup
-	fperms +x /usr/lib/scylla-manager/scyllamgr_auth_token_gen
-	fperms +x /usr/lib/scylla-manager/scyllamgr_ssl_cert_gen
-
-	newinitd "${FILESDIR}/scylla-manager-agent.initd" ${PN}
-}
-
-pkg_config() {
-	/usr/lib/scylla-manager/scyllamgr_agent_setup -y --no-enable-service
-}
diff --git a/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild b/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild
index 8c71da9..cb180a0 100644
--- a/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild
+++ b/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}"
 RESTRICT="fetch"
 S="${WORKDIR}/${PN}-${MY_V}.x86_64"
 
+pkg_setup() {
+	enewgroup scylla-manager
+	enewuser scylla-manager -1 -1 /var/lib/scylla-manager scylla-manager
+}
+
 src_unpack() {
 	for rpm in ${A}; do
 		rpmunpack "${DISTDIR}/${rpm}" || die
@@ -30,9 +35,6 @@ src_unpack() {
 
 src_prepare() {
 	default
-	sed -e 's/User=scylla-manager/User=scylla/g' -i usr/lib/systemd/system/*.service || die
-	sed -e 's/Group=scylla-manager/User=scylla/g' -i usr/lib/systemd/system/*.service || die
-
 	rm -rf usr/share || die
 }
 
@@ -40,7 +42,7 @@ src_install() {
 	default
 
 	keepdir /var/lib/scylla-manager
-	fowners scylla:scylla "/var/lib/scylla-manager"
+	fowners scylla-manager:scylla-manager "/var/lib/scylla-manager"
 
 	insinto /etc
 	doins -r etc/*