Merge changes from community/grafana

6 files changed, 66 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56f884de2a2d..dd3f4adfaf65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,24 @@
 pkgbase = grafana-bin
-	pkgdesc = A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version
+	pkgdesc = Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB - binary version
 	pkgver = 9.1.0
-	pkgrel = 1
-	url = http://grafana.org
+	pkgrel = 2
+	url = http://grafana.com/
 	install = grafana.install
 	arch = x86_64
 	arch = armv6h
 	arch = armv7h
 	arch = aarch64
+	license = AGPL
 	license = Apache
 	provides = grafana
 	conflicts = grafana
 	backup = etc/grafana.ini
 	source = grafana.service
+	source = grafana.sysusers
+	source = grafana.tmpfiles
 	sha256sums = fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f
+	sha256sums = 9cbd46f771dae5e2308b991a00d07a25cc1765f9bdd4082726108e3476403b56
+	sha256sums = 3cd6026ba009e05f49ec265d049d590d4f35330c1f14cd90a468c8d588501675
 	source_x86_64 = https://dl.grafana.com/oss/release/grafana-9.1.0.linux-amd64.tar.gz
 	sha256sums_x86_64 = 4c51a0c1d651cfbedb4a299b846b03d3a5a2f51c1627574d9bd44f027219f601
 	source_armv6h = https://dl.grafana.com/oss/release/grafana-9.1.0.linux-armv6.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..54d4e2e8738a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+grafana-*.tar.gz
+grafana-*.tar
diff --git a/PKGBUILD b/PKGBUILD
index 24162f72d98e..26bfe8ec4152 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Zhuoyun Wei <wzyboy@wzyboy.org>
+# Contributor: Sébastien "Seblu" Luttringer
 # Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
 # Contributor: Gilles Hamel <hamelg at laposte dot net>
 # Contributor: Erikas Rudinskas <erikmnkl@gmail.com>
@@ -6,38 +7,54 @@
 pkgname=grafana-bin
 _pkgname=grafana
 pkgver=9.1.0
-pkgrel=1
-pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version"
-url="http://grafana.org"
+pkgrel=2
+pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB - binary version'
+url='http://grafana.com/'
 conflicts=('grafana')
 provides=('grafana')
 arch=('x86_64' 'armv6h' 'armv7h' 'aarch64')
-license=('Apache')
+license=('AGPL' 'Apache')
 install=${_pkgname}.install
-backup=("etc/${_pkgname}.ini")
-source=("grafana.service")
+backup=('etc/grafana.ini')
+source=('grafana.service'
+        'grafana.sysusers'
+        'grafana.tmpfiles'
+       )
+install=$_pkgname.install
 source_x86_64=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-amd64.tar.gz")
 source_armv6h=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-armv6.tar.gz")
 source_armv7h=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-armv7.tar.gz")
 source_aarch64=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-arm64.tar.gz")
-sha256sums=('fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f')
+sha256sums=('fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f'
+            '9cbd46f771dae5e2308b991a00d07a25cc1765f9bdd4082726108e3476403b56'
+            '3cd6026ba009e05f49ec265d049d590d4f35330c1f14cd90a468c8d588501675')
 sha256sums_x86_64=('4c51a0c1d651cfbedb4a299b846b03d3a5a2f51c1627574d9bd44f027219f601')
 sha256sums_armv6h=('78a9b64ae647750b6a7072149722535883b64c1e3c783489dceed83bb4ccda91')
 sha256sums_armv7h=('7ba3bf85d8902ecebc0615e09c8f4411a3909aba31c529669dcac0756dd9ee3f')
 sha256sums_aarch64=('e1411640ea2cb41f615433315b6ffcc0ec4278c3ec52c3b4a6cd61602557af0d')
 
-package() {
-  install -Dm644 "${srcdir}/grafana.service" "$pkgdir/usr/lib/systemd/system/grafana.service"
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  install -dm755 "${pkgdir}/var/lib/grafana"
-  install -dm755 "${pkgdir}/var/log/grafana"
-  install -Dm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
-  install -Dm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli"
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  # set arch linux paths
   sed -ri 's,^(\s*data\s*=).*,\1 /var/lib/grafana,' conf/defaults.ini
   sed -ri 's,^(\s*plugins\s*=).*,\1 /var/lib/grafana/plugins,' conf/defaults.ini
   sed -ri 's,^(\s*provisioning\s*=).*,\1 /var/lib/grafana/conf/provisioning,' conf/defaults.ini
   sed -ri 's,^(\s*logs\s*=).*,\1 /var/log/grafana,' conf/defaults.ini
-  install -Dm644 conf/defaults.ini "$pkgdir/etc/${_pkgname}.ini"
-  install -dm755 "$pkgdir/usr/share/${_pkgname}/"
+}
+
+package() {
+  install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf"
+  install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf"
+  install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service"
+
+  cd ${_pkgname}-${pkgver}
+  install -Dm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
+  install -Dm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli"
+  install -Dm640 -o207 -g207 conf/sample.ini "$pkgdir/etc/grafana.ini"
+  install -Dm644 conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini"
+  install -dm755 "$pkgdir/usr/share/grafana/"
   cp -r public scripts plugins-bundled "$pkgdir/usr/share/grafana/"
+
+  # Remove unit tests
+  rm -r "$pkgdir/usr/share/grafana/public/test"
 }
diff --git a/grafana.install b/grafana.install
index f6ef82a7f506..56563086ff8e 100644
--- a/grafana.install
+++ b/grafana.install
@@ -1,13 +1,22 @@
-post_install() {
-	getent group grafana >/dev/null || groupadd -r grafana
-	getent passwd grafana >/dev/null || useradd -d /var/lib/grafana -g grafana -r -M -s /bin/false grafana
-	chown grafana:grafana /var/{lib,log}/grafana
-}
+#/bin/sh
 
+# arg 1:  the new package version
+# arg 2:  the old package version
 post_upgrade() {
-	post_install
+  if (( "$(vercmp $2 2.6.0-3)" < 0 )); then
+    echo '==> Configuration moved to /etc/grafana.ini'
+  fi
+  if (( "$(vercmp $2 4.4.3-1)" < 0 )); then
+    echo '==> Grafana now uses static UID/GID 207'
+    echo '==> Trying to update your previous UID/GID'
+    if ! { usermod -u 207 grafana && groupmod -g 207 grafana &&
+      chown -R 207:207 /var/{lib,log}/grafana; }; then
+      echo '==> Automatic GID/UID change failed. Do it manually!'
+      echo '==> usermod -g 207 grafana && groupmod -u 207 grafana && chown -R 207:207 /var/l{ib,og}/grafana'
+    fi
+    echo '==> Check the ownership of your files!'
+  fi
+  return 0
 }
 
-post_remove() {
-	userdel grafana
-}
+# vim:set ts=2 sw=2 et:
diff --git a/grafana.sysusers b/grafana.sysusers
new file mode 100644
index 000000000000..ccf29039f22a
--- /dev/null
+++ b/grafana.sysusers
@@ -0,0 +1 @@
+u grafana 207 - /var/lib/grafana
diff --git a/grafana.tmpfiles b/grafana.tmpfiles
new file mode 100644
index 000000000000..f7881036c749
--- /dev/null
+++ b/grafana.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/grafana 0750 grafana grafana -
+d /var/log/grafana 0750 grafana grafana -