[arch-commits] Commit in grafana/trunk (PKGBUILD grafana.service grafana.tmpfiles)
Sébastien Luttringer
seblu at archlinux.org
Tue Jan 1 14:13:04 UTC 2019
Date: Tuesday, January 1, 2019 @ 14:13:04
Author: seblu
Revision: 420154
upgpkg: grafana 5.4.2-3
- See FS#61089
- Fix FS#61220
Modified:
grafana/trunk/PKGBUILD
grafana/trunk/grafana.service
grafana/trunk/grafana.tmpfiles
------------------+
PKGBUILD | 24 ++++++++++++++----------
grafana.service | 2 +-
grafana.tmpfiles | 1 -
3 files changed, 15 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-01 13:42:45 UTC (rev 420153)
+++ PKGBUILD 2019-01-01 14:13:04 UTC (rev 420154)
@@ -4,24 +4,24 @@
pkgname=grafana
pkgver=5.4.2
-pkgrel=2
+pkgrel=3
pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
-url='http://grafana.org'
+url='https://grafana.com/'
arch=('x86_64')
license=('Apache')
depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts')
-makedepends=('git' 'go' 'npm' 'grunt-cli' 'python2')
-backup=("etc/grafana.ini")
+makedepends=('git' 'go-pie' 'npm' 'grunt-cli' 'python2')
+backup=('etc/grafana.ini')
source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"
- "grafana.service"
- "grafana.sysusers"
- "grafana.tmpfiles"
+ 'grafana.service'
+ 'grafana.sysusers'
+ 'grafana.tmpfiles'
)
install=$pkgname.install
md5sums=('SKIP'
- '91de91702c9982073fe626d00c0e0f44'
+ '25c2adc03fad89286b72c1bf8bf3e361'
'e991d8cdf91c1e25652cdbc51fc726c5'
- 'b9b576d1959fc063b3399892e201488c')
+ 'bdc90cffca3c44c7a86e0fdac154092f')
prepare() {
cd $pkgname
@@ -33,6 +33,11 @@
patch -p1 -N -i "$srcdir/${filename##*/}"
fi
done
+ # 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
:
}
@@ -69,7 +74,6 @@
for i in vendor public tools; do
cp -r "$i" "$pkgdir/usr/share/grafana/$i"
done
- ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data"
}
# vim:set ts=2 sw=2 et:
Modified: grafana.service
===================================================================
--- grafana.service 2019-01-01 13:42:45 UTC (rev 420153)
+++ grafana.service 2019-01-01 14:13:04 UTC (rev 420154)
@@ -11,7 +11,7 @@
TimeoutStopSec=20
SuccessExitStatus=0 2
NoNewPrivileges=yes
-ProtectSystem=strict
+ProtectSystem=full
ProtectHome=true
PrivateTmp=true
PrivateDevices=true
Modified: grafana.tmpfiles
===================================================================
--- grafana.tmpfiles 2019-01-01 13:42:45 UTC (rev 420153)
+++ grafana.tmpfiles 2019-01-01 14:13:04 UTC (rev 420154)
@@ -1,3 +1,2 @@
d /var/lib/grafana 0750 grafana grafana -
d /var/log/grafana 0750 grafana grafana -
-L /var/lib/grafana/log - - - - ../../log/grafana
More information about the arch-commits
mailing list