gentoo auto-resync : 21:03:2023 - 00:38:34

5 files changed, 43 insertions, 4 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 40cabba341c3..853bad77b049 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 2ab676d14e71..402f187977e7 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,5 +1,6 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
+AUX grafana.initd2 1498 BLAKE2B ce22443e0f328487cc9e1ff3e7df23c5a0deb790dd99b51330d388df3345d33f9e0588733323a0becff9fcb559c004860a2c080b2dbb21731a49bce5b387db41 SHA512 c7684f2d8647cf3c48a030f17250a592614fb74f846ff8821f07cd2031bc39ab50bb1936eb5eddeab9f67823c86c392648373b551c2c30e728c1501b3273242b
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-9.3.0.tar.gz 88847005 BLAKE2B 4c37dc077b7f9fb8f9256a2a85094eef5ae2dabe693d039b7c5509ec2662ec544d307dc1cf0043301fb4c3525107bddfac0a7f7a67f0efb8b333936c1b96192d SHA512 1489d3f948259dd3db6403e95f176fea664cb5bfc83a6f22e57ffbe075cc07257a463c4b1d1fd8aa94fbad5473b29608f0c3fc6fdf0c08bcb72f3beeff5163c7
 DIST grafana-bin-9.3.2.tar.gz 89322650 BLAKE2B b9256b6468aa4eff1d77a7bce1f701ab61a372baf2f239572921b04a5624933e57c881035de9a0a86a5ff17b942e2965a7807ae2c183a60cfabb4bd4bf546acb SHA512 9d13624f728b5f5845c9780372b9334d81faadf03b47034b0de708fe87e50db3daff95f61e5649548cf6a4181253cc39f6d523dde5651833e72df42fe3577f16
@@ -9,6 +10,6 @@ DIST grafana-bin-9.4.3.tar.gz 83780585 BLAKE2B b8b609bb701b63262e0b70e551b608e49
 EBUILD grafana-bin-9.3.0.ebuild 1806 BLAKE2B 874e8d2ddc17eca0512231ed58b018230b1a59797820d57a5e7eda97db4f152b7029bf890612a23a1f4cd6d8c7a10e8866eaf5a9d24cd76c62ec2f639e2a0b1e SHA512 bb4063c8c87104da3b55d8c849fc7fb5e1ab68fcf2a087eaf262f6cf6493967281ca72e5ab8dc1850dffe640ab9e87380f8f484e04fe505b8bed92ac851355d5
 EBUILD grafana-bin-9.3.2.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
 EBUILD grafana-bin-9.3.6.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
-EBUILD grafana-bin-9.3.8.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
-EBUILD grafana-bin-9.4.3.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
+EBUILD grafana-bin-9.3.8-r1.ebuild 1826 BLAKE2B 4838306e575eb25b95298d28272f5e828cffb52d4431d1c74f884901cd389fdf17f0a886ccec9ad85e386bcc03efa283a1879326791573592e2634320d8c8d79 SHA512 069994b16dd9c8a037192528985a2d539231cbd6a80390e3fcadf862d31abf70841e477384593396e573a490c01fa9af5ceb2b31c87f388ebb020d1f7f03a0e0
+EBUILD grafana-bin-9.4.3-r1.ebuild 1826 BLAKE2B 4838306e575eb25b95298d28272f5e828cffb52d4431d1c74f884901cd389fdf17f0a886ccec9ad85e386bcc03efa283a1879326791573592e2634320d8c8d79 SHA512 069994b16dd9c8a037192528985a2d539231cbd6a80390e3fcadf862d31abf70841e477384593396e573a490c01fa9af5ceb2b31c87f388ebb020d1f7f03a0e0
 MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/files/grafana.initd2 b/www-apps/grafana-bin/files/grafana.initd2
new file mode 100644
index 000000000000..1c8f6b2af56f
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd2
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+GRAFANA_USER="${GRAFANA_USER:-"grafana"}"
+GRAFANA_GROUP="${GRAFANA_GROUP:-"grafana"}"
+GRAFANA_CONFIGFILE="${GRAFANA_CONFIGFILE:-"/etc/grafana/${RC_SVCNAME}.ini"}"
+GRAFANA_DATADIR="${GRAFANA_DATADIR:-"/var/lib/grafana"}"
+GRAFANA_LOGDIR="${GRAFANA_LOGDIR:-"/var/log/grafana"}"
+GRAFANA_PIDFILE="${GRAFANA_PIDFILE:-"/run/${RC_SVCNAME}.pid"}"
+GRAFANA_SSDARGS=${GRAFANA_SSDARGS:-"--wait 1000"}
+GRAFANA_TERMTIMEOUT=${GRFANA_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/grafana"
+command_args="server -homepath=/usr/share/grafana"
+command_args="${command_args} -config=\"${GRAFANA_CONFIGFILE}\""
+command_args="${command_args} cfg:default.paths.data=\"${GRAFANA_DATADIR}\""
+command_args="${command_args} cfg:default.paths.logs=\"${GRAFANA_LOGDIR}\""
+command_background="yes"
+pidfile="${GRAFANA_PIDFILE}"
+retry="${GRAFANA_TERMTIMEOUT}"
+start_stop_daemon_args="--user ${GRAFANA_USER}:${GRAFANA_GROUP} ${GRAFANA_SSDARGS}"
+
+description="Grafana server, feature rich metrics dashboard and graph editor."
+
+required_files="${GRAFANA_CONFIGFILE}"
+
+depend() {
+	need localmount
+}
+
+start_pre() {
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}" || return 1
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/dashboards" || return 1
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/plugins" || return 1
+}
diff --git a/www-apps/grafana-bin/grafana-bin-9.3.8.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
index 0e8aae35965c..ed079e9887f5 100644
--- a/www-apps/grafana-bin/grafana-bin-9.3.8.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
@@ -38,10 +38,11 @@ src_install() {
 	doins -r public conf
 
 	dobin bin/grafana-cli
+	dobin bin/grafana
 	dobin bin/grafana-server
 
 	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
+	newinitd "${FILESDIR}"/grafana.initd2 grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
 
 	keepdir /var/{lib,log}/grafana
diff --git a/www-apps/grafana-bin/grafana-bin-9.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
index 0e8aae35965c..ed079e9887f5 100644
--- a/www-apps/grafana-bin/grafana-bin-9.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
@@ -38,10 +38,11 @@ src_install() {
 	doins -r public conf
 
 	dobin bin/grafana-cli
+	dobin bin/grafana
 	dobin bin/grafana-server
 
 	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
+	newinitd "${FILESDIR}"/grafana.initd2 grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
 
 	keepdir /var/{lib,log}/grafana