summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorErikas Rudinskas2020-03-06 12:11:15 +0200
committerErikas Rudinskas2020-03-06 12:11:15 +0200
commit25df88d8b8aa8f06c3ef29b8903afaf819fe74aa (patch)
treef6c6209f43f1e84c578a68b29ff85e8eedfd2a50
parent982dac303396eee5c5badfdce9cac47d07cf65c8 (diff)
downloadaur-25df88d8b8aa8f06c3ef29b8903afaf819fe74aa.tar.gz
Fix paths
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--grafana.install2
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c5f4ad991b..7860f6c1004 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = grafana-bin
pkgdesc = A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version
pkgver = 6.6.2
- pkgrel = 3
+ pkgrel = 4
url = http://grafana.org
install = grafana.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index f49b41e49fb..0cc4cec9a9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=grafana-bin
_pkgname=grafana
pkgver=6.6.2
-pkgrel=3
+pkgrel=4
pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version"
url="http://grafana.org"
conflicts=('grafana')
@@ -32,11 +32,11 @@ 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/logs/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"
sed -i '/^;data = /c\data = /var/lib/grafana' conf/sample.ini
- sed -i '/^;logs = /c\logs = /var/logs/grafana' conf/sample.ini
+ sed -i '/^;logs = /c\logs = /var/log/grafana' conf/sample.ini
install -Dm644 conf/sample.ini "$pkgdir/etc/${_pkgname}/${_pkgname}.ini"
install -Dm644 conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini"
cp -r public scripts tools "$pkgdir/usr/share/grafana/"
diff --git a/grafana.install b/grafana.install
index 1edcc2ec733..f6ef82a7f50 100644
--- a/grafana.install
+++ b/grafana.install
@@ -1,7 +1,7 @@
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,logs}/grafana
+ chown grafana:grafana /var/{lib,log}/grafana
}
post_upgrade() {