From 222a898b3058dc30fa9ced4e96fed87f5ab92f17 Mon Sep 17 00:00:00 2001
From: Ultrabug <ultrabug@gentoo.org>
Date: Fri, 10 Jul 2020 16:34:28 +0200
Subject: app-admin/scylla-manager-agent: switch to scylla user

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
---
 app-admin/scylla-manager-agent/Manifest              | 20 ++++++++++----------
 .../files/scylla-manager-agent.initd                 |  4 ++--
 .../scylla-manager-agent-2.1.0.ebuild                |  7 -------
 3 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'app-admin')

diff --git a/app-admin/scylla-manager-agent/Manifest b/app-admin/scylla-manager-agent/Manifest
index bb6898b..111b549 100644
--- a/app-admin/scylla-manager-agent/Manifest
+++ b/app-admin/scylla-manager-agent/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX scylla-manager-agent.initd 771 BLAKE2B ea62fae48341e8bcd4cceb6466e13643b108e23a3ca9e63bf78abe23cfab951cb10452141cd94f536313e3a0b6ce2115193b1efc527154c0d0581188ba1c6596 SHA512 cbf87c357a72247b17c774d0c71531db32396d2d7f248516bf60289f33dffc54cefb35844291c9a9c3c3a4e4e70c79ee815f5d3c440e14f786433ddc69a6e4b6
+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
-EBUILD scylla-manager-agent-2.1.0.ebuild 1179 BLAKE2B a7f746d36a9b74d78ad74e7fe81e6b7b2ed269bb93886c463c51133d7d825cf891ad09fba0168df8294024b4252ddb7a75a8850bb725fe2e322a8b421b6ace7d SHA512 51e53433dcf1c55246d23415e172ae334f18bb23d5e1b2a780153bf826f2d74925e2279e457ea17cda481b82a9d250ad70d29bfc4e83e3bdce818b2cb0de5f37
+EBUILD scylla-manager-agent-2.1.0.ebuild 1061 BLAKE2B b20901f0bd30d9ab7628188b4cf1e6b79fda58c5aab79c2c103dee2272492479a9f3ae1e6480431cc8de02ccc6dcfb2c858ed761f8ec1bc52dca11ba518e9cb5 SHA512 dd85802f7d68b2cc7bf45e9a67353819e8c25f5a45c316519c8a5f5c34c25a8564ec191be4f4675a72f284f8651c6e3019234e918497ec13d6b4d2c1efdea89c
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl7o8mFfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl8IfFhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy/pAQgAjk9sDyfNCPf0I2bHwSuk8ltD29uM0ieDUSBGa56O5C1fjnhQt1ofILGi
-qTc1eDbuNpzcY1UihQtlgT9Ix1R6wOeWo0m4xM31VEBNKeScXsnxuBZaMblo7jW0
-oXUQ3otNFfliMiELxgatn7zOYOQWOf3YvxVEJuaB+R7REIMKHz4IExMkKsGhyr7c
-18UYXdLHOs06pCAOrhwci2blXvLdVd6G4Wu7uuxtQNBBnHlJjJod+89kLhKKc0eI
-jDMkPHEaY6LIeKHOetx3gRfC9QtESZXJ+7UKUxsMFDPODZZ6WRKdeoy8uTGytr8M
-4pRF7/NZQzX0F/X0g1QIpOfAx1G1hQ==
-=BQ0F
+dy8R1Af/Sm9BR1aAe9a2AN81TYgTykrXdlRi4mr4cWUuJsBldklc33fxAoc3Wn3I
+j3YzpYeiJ/Rjd5a2fatI2xweiaPnDFQrT6aXOWFuHYk2gGR1UKhWurPgzDs9Momz
+0dqtV+3t04Ou9WAJ9uVSdTDqGhYlyngsKDAtfLMDgs5AT4Tgpp/ig7MWvtczoyVX
+hAXGuHanT6EeIj3j5oTZs5AWHjwpcOWBNkOUF2SMuN+3ZyQqw9cmVX6CmmSTDvyn
+WPU/61qhT3yqKJxao2sHi9H/k/+54O6hMXKSFefncdeh4yeJ8jQVhfqksDSQav67
+GesMIGptvySmxRhnQ2zE3iWP9ylL2A==
+=a413
 -----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 e7bcca0..7ddfe7f 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-manager}
-group=${GROUP:-scylla-manager}
+user=${USER:-scylla}
+group=${GROUP:-scylla}
 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
index b6e43ff..d72be58 100644
--- 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
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit user
-
 MY_V="2.1.0-0.20200611.9be1c609"
 
 DESCRIPTION="Scylla Manager Agent"
@@ -24,11 +22,6 @@ DEPEND="${RDEPEND}"
 RESTRICT="fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-	enewgroup scylla-manager
-	enewuser scylla-manager -1 -1 /var/lib/${PN} scylla-manager
-}
-
 src_unpack() {
 	for rpm in ${A}; do
 		rpmunpack "${DISTDIR}/${rpm}" || die
-- 
cgit v1.2.3-18-g5258