summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Dray2015-07-22 09:07:27 +1000
committerJustin Dray2015-07-22 09:07:27 +1000
commita2929543f362eb2e26405d205549d9606bf9e1f5 (patch)
tree593089076ab883f6d56da45fda94cf36827dc799
parentb8cfae33bdba9a7b125636ddcb303d85a4f14f62 (diff)
downloadaur-a2929543f362eb2e26405d205549d9606bf9e1f5.tar.gz
Fixed bad default db path.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--config.patch2
-rw-r--r--grafana.install1
4 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 022ef218d317..2db9a2e2a09b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = grafana-git
pkgdesc = A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb
- pkgver = v2.0.2.r470.g37d7590
+ pkgver = v2.0.2.r566.ga386733
pkgrel = 1
url = http://grafana.org
install = grafana.install
@@ -15,7 +15,7 @@ pkgbase = grafana-git
source = config.patch
source = grafana.service
md5sums = SKIP
- md5sums = d5691b6e4f0ac0e0aa010801c9870d30
+ md5sums = f676cfe7bdd2463e2600ff8fce75a2d6
md5sums = 05508c9c21f4c93ad86944a52d37e925
pkgname = grafana-git
diff --git a/PKGBUILD b/PKGBUILD
index 418978c553f4..0f368bee7a48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Gilles Hamel <hamelg at laposte dot net>
_pkgname=grafana
pkgname=${_pkgname}-git
-pkgver=v2.0.2.r470.g37d7590
+pkgver=v2.0.2.r566.ga386733
pkgrel=1
pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb"
url="http://grafana.org"
@@ -16,7 +16,7 @@ source=("git+https://github.com/${_pkgname}/${_pkgname}"
"config.patch"
"grafana.service")
md5sums=('SKIP'
- 'd5691b6e4f0ac0e0aa010801c9870d30'
+ 'f676cfe7bdd2463e2600ff8fce75a2d6'
'05508c9c21f4c93ad86944a52d37e925')
pkgver() {
@@ -52,6 +52,8 @@ build() {
package() {
install -Dm644 "${srcdir}/grafana.service" "$pkgdir/usr/lib/systemd/system/grafana.service"
cd "${srcdir}/${_pkgname}"
+ install -dm755 "${pkgdir}/var/lib/grafana"
+ install -dm755 "${pkgdir}/var/log/grafana"
install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
install -Dm644 tmp/conf/sample.ini "$pkgdir/etc/${_pkgname}/${_pkgname}.ini"
install -Dm644 tmp/conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini"
diff --git a/config.patch b/config.patch
index 5f8509ff4c58..5a757d4b90b9 100644
--- a/config.patch
+++ b/config.patch
@@ -30,7 +30,7 @@ index 258a019..6a7bd6b 100644
# For "sqlite3" only, path relative to data_path setting
-path = grafana.db
-+path = /var/lib/grafanagrafana.db
++path = /var/lib/grafana/grafana.db
#################################### Session ####################################
[session]
diff --git a/grafana.install b/grafana.install
index ff6fc1aa438f..132fb3fcede9 100644
--- a/grafana.install
+++ b/grafana.install
@@ -5,6 +5,5 @@ post_upgrade() {
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
- mkdir -p /var/{lib,log}/grafana
chown grafana:grafana /var/{lib,log}/grafana
}