summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2019-12-06 19:05:39 +0100
committerUltrabug <ultrabug@gentoo.org>2019-12-06 19:05:39 +0100
commit49a5e1279416c2f48a41bf4e9e45e125df72f9be (patch)
tree991703bcaaa7ca12ac015256bac5c49b40907a74 /dev-db/scylla
parentdev-db/scylla: add asias patch to debug 3.1.1 on r2 (diff)
downloadultrabug-49a5e1279416c2f48a41bf4e9e45e125df72f9be.tar.gz
ultrabug-49a5e1279416c2f48a41bf4e9e45e125df72f9be.tar.bz2
ultrabug-49a5e1279416c2f48a41bf4e9e45e125df72f9be.zip
dev-db/scylla: update initd and confd to handle chdir
Package-Manager: Portage-2.3.80, Repoman-2.3.19 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
Diffstat (limited to 'dev-db/scylla')
-rw-r--r--dev-db/scylla/Manifest20
-rw-r--r--dev-db/scylla/files/scylla-server.confd1
-rw-r--r--dev-db/scylla/files/scylla-server.initd5
3 files changed, 14 insertions, 12 deletions
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 198a8f6..b9a152c 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -8,8 +8,8 @@ AUX 3.1-revert-64-bit-gc_clock.patch 1132 BLAKE2B 7ed59d5f898babc4940bcd10a8aaf4
AUX 3.1-thrift-support.patch 39980 BLAKE2B 7de8bde052186b8a62ea83b7082e9828d4c320ed86381a93d5136906ba014631dc3b5e2a2b1dfd33bec21c6bd7d685fa3f1f270c97f233934cca24473d0e52b5 SHA512 d33e50dbef01dfd4845a093c160b5cbedc658770c1b5a5de063c56b43df0731329fe0cdb3ddfa5d72020ab25573682e4d14a3c39ad366a208694062a3fd49155
AUX boost-1.65.0-icl-ttp-matching.patch 1427 BLAKE2B de9c77253963656f85ed2d05babd600bc5b59b567bc889ed815dfba97f2a1334df48dbb1e67879dea1419fb439c513c54a66531d4e8ec28a7848385f70471334 SHA512 aaa7959df631c17a80486e5b6724d76bf2193694f5559443350c74567506f36c133f740adcbb1b2d3a5a2760730f498f0fd655ec6eff6d20393b6e49549c6ec8
AUX fix-fmt-3.5.0-compilation.patch 3785 BLAKE2B 3cd23ccffe1ec33d5f7e2c6c3583631b294fc0e6d36e49eef582598fd168968805dd7ca4cc786c02cb20ae1e758a814e1b761dbd41a86330906cd4b5af5d6666 SHA512 d7606559fb2aef9ea009e8c417397dcc94d0c708da8283d4c1c6393c059ecca50d9806cfb19d1fe69b8d7898da2b8d194fbc8b8dd1aa9c12e0d6120d52bc2518
-AUX scylla-server.confd 386 BLAKE2B e075e8f5cac2ac373a43a637a4080fde5cbd402b5bef2a3865980f3f9d123366315d994ebf9abbd749167db6e1fa9c840295171add7c5507120be70020aaefa1 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87
-AUX scylla-server.initd 962 BLAKE2B cbe13c8a03cb4d084e477dd449ff51355e886a31d70a8da1cf2a899b3f48c2c01680dd020d665c71497b1c6b2dadd38d417ea80389413b1e54ee622f207c37ce SHA512 b77473bba63e1fa9e83c0d0c9ba5cd7cc69920ada8b1a79de1a5bc609f797e870b7cd31af658cb11d84d019c905c78a4a0420173226163048ca6439ea2210a16
+AUX scylla-server.confd 396 BLAKE2B dc522b308985e51c24449a333d793eaa777a74b8b5594f1ff4a092aae003202791019a255ea478c4e794a83ca0e01d2c49aac3d267501624f461fa3edfe1c41f SHA512 51739cdeedaedb1a73a345ec6a4a2761d29fac1b9cf61f02937559aed43f02112109464254213118d40af1fb7e8491c22f8cb88908c9c88523dfe1b78b8430c7
+AUX scylla-server.initd 1020 BLAKE2B 63ca86a8e1bf9690c2e5ad33d29d4383f1c7ffd4b120c990d262517b0339127df0d95a87ab64d97bfb1cdf2bfe023df52ab24ac9e586aaa6b48108c83ce40cbd SHA512 c07f2b60926c44462fe2e16774bcd75966fb4e8b49311c86f7559d3563b4821dc5d5f43518addddc00c9d4450a8672023af71a76657f3f4fdf1f3985c03f4ad9
AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb8c0525d714d27dfa438efa9c6871c916b82ebf56f34c507826315de8b1fadc3d0eb5feae663cbcc SHA512 aabdeb3854eaad4b1cf9037a998cf94b8f55b2011e8f81a1778095b71806d89e217f2025e772c636569f833f7df45108e2e30c2c1e70fdb59acf37e6cdf81485
AUX v1-0001-repair-Add-a-timer-for-repair-reader.patch 930 BLAKE2B f878c83a33fc56faa1735157266d2392987c5b9f93cb609b57b9554918fe48a35248d56a52d8e2cfd28b24c47a8ee7020711beee1b8b3bbcf0d549467beee00e SHA512 c4b9d725957ad847817ba2ea0ccd416cb79dddc06980554506903a965da35af0774ffd531ce69f3013e4904e2b6e6b1b66a12e073e19486b8be11b3e93a4502c
DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1644001 BLAKE2B ee3f919dbb7de3f489a9027cf89b8db1dd36d9d5068e80f6e3851366c7a6fa532c67cf8ebf0d15e01b26a8ec5bb4e49e7844ec46b605f997fac1e961dcc436f1 SHA512 52b929e4d2615338d8ee4ce7c32f006f18e54ef2db9fbe2534c4e99cd3684d86661a6674d2659acb714592f439fac9c4f0ae6337d9d68c1ec3463d4d16572310
@@ -37,14 +37,14 @@ MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl3f7uNfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl3qmFdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy+gzAf/cfB9kSTb9madBq91gG7VdTiuh1S/9Tna277V2jqBCDSfqOn7FvUQLHNU
-K7k4xuu4ex1LaB0H3yNtWxUK/zSLKctQ0WXQxwd8JUVB0ya0Gfg+gy35gW2VQUbk
-zbJU9krgxhCMAvGnMS+USyBx6pDMUgDqP0loFA8e91RKW6fmlS4zxjOAMALHGvzB
-2gANmac+j1kz2bk3ctZ0/NUG6PTHcfjs9Ml8q7uVq09Nn+dJ1/eZUB6nILsFffA7
-2hj4ZWDlqFKM9GWvkwQJqLSqqF5c9o+JhaM/apEbdKTzcK7Y0Z3qmTVMW8zf5aFj
-pem2tYp3rzKc9MxwBj0R8jBLrRJYnQ==
-=LbUA
+dy+6dQgAwHOH686IyAKuusNcZd83MhR+y0g0KuwYtPULIV/12b2OwrKHb/3kVrWW
+rzEhL3N/RTuiZC/7E//IgOVnYQc2TmKCOVTQUV2/rSQh+MeCILkNCqkD/h2+qyVK
+JbpEl/HpHdqSfLNLOcZckwQlqIZrzLdC+Kau4fwsOkNkROQ7VRr5u0Mj/zmnxVqj
+Cwq/o8cCw8o2n9pgTnQ9QzIHNa+eS2w8JzNM7TkDcJJ+vY4Y9TOW80+oOK98TPoM
+mnZWy3E1iFR2mxnhLFPFUwS1SGoSR55GmuFikiTbaSjnBz2QZb8XIxbqzjy/fR6g
+RHCDQhmh+ZZrjo6s9zGsqk+13fbMUA==
+=4rmZ
-----END PGP SIGNATURE-----
diff --git a/dev-db/scylla/files/scylla-server.confd b/dev-db/scylla/files/scylla-server.confd
index 4a583ec..f210c1b 100644
--- a/dev-db/scylla/files/scylla-server.confd
+++ b/dev-db/scylla/files/scylla-server.confd
@@ -1,6 +1,7 @@
# please check the defaults of scylla in the /etc/default/scylla-server file!
#
# you can configure the following options for the OpenRC init script:
+# - chdir
# - config_file
# - run_dir
diff --git a/dev-db/scylla/files/scylla-server.initd b/dev-db/scylla/files/scylla-server.initd
index bb94f93..f51b74f 100644
--- a/dev-db/scylla/files/scylla-server.initd
+++ b/dev-db/scylla/files/scylla-server.initd
@@ -1,9 +1,10 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
config_file=${config_file:-/etc/scylla/scylla.yaml}
run_dir=${run_dir:-/run/scylla}
+chdir=${chdir:-/var/lib/scylla/coredump}
command="/usr/bin/scylla"
command_args="--options-file ${config_file} ${CPUSET} ${DEV_MODE} ${SEASTAR_IO} ${SCYLLA_ARGS}"
@@ -13,7 +14,7 @@ pidfile=${run_dir}/${SVCNAME}.pid
user=${USER:-scylla}
group=${GROUP:-scylla}
retry="SIGTERM/120"
-start_stop_daemon_args="--user ${user} --group ${group} --wait 5000"
+start_stop_daemon_args="--chdir ${chdir} --user ${user} --group ${group} --wait 5000"
depend() {
use net localmount logger