summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--grafana.service20
3 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5762d745743..7c16cb7a48a 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.1
- pkgrel = 1
+ pkgrel = 2
url = http://grafana.org
install = grafana.install
arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = grafana-bin
conflicts = grafana
backup = etc/grafana/grafana.ini
source = grafana.service
- sha256sums = 44ceb7aad648c8e46a65026109fc0327bc6e01ba7060d97d9e83a3e8ad65379c
+ sha256sums = fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f
source_x86_64 = https://dl.grafana.com/oss/release/grafana-6.6.1.linux-amd64.tar.gz
sha256sums_x86_64 = 0edc8207e356ef66eb7b1c78a1cdabc2cd5c0655de774000de2ad0397e543377
source_armv6h = https://dl.grafana.com/oss/release/grafana-6.6.1.linux-armv6.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index a2d6938edec..838fe580128 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=grafana-bin
_pkgname=grafana
pkgver=6.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version"
url="http://grafana.org"
conflicts=('grafana')
@@ -19,7 +19,7 @@ source_x86_64=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-amd64
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=('44ceb7aad648c8e46a65026109fc0327bc6e01ba7060d97d9e83a3e8ad65379c')
+sha256sums=('fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f')
sha256sums_x86_64=('0edc8207e356ef66eb7b1c78a1cdabc2cd5c0655de774000de2ad0397e543377')
sha256sums_armv6h=('1e1b0c43a188fae477da3cec6aad7480a1af5508c3f0c83241df27ba0d701315')
sha256sums_armv7h=('07ee97f550bfb7b34294308c2d56c0679901576b5d5baf562dd9d73edb5c45c5')
diff --git a/grafana.service b/grafana.service
index 08cbaffe919..13e8dc020d4 100644
--- a/grafana.service
+++ b/grafana.service
@@ -1,19 +1,23 @@
[Unit]
-Description=Grafana server
-Documentation=http://docs.grafana.org
-After=network.target
+Description=Grafana service
+After=network.target postgresql.service mariadb.service mysqld.service
[Service]
User=grafana
Group=grafana
-Type=simple
WorkingDirectory=/usr/share/grafana
-ExecStart=/usr/bin/grafana-server \
- --config=/etc/grafana/grafana.ini \
- cfg:default.paths.logs=/var/log/grafana \
- cfg:default.paths.data=/var/lib/grafana
+ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini
LimitNOFILE=10000
TimeoutStopSec=20
+SuccessExitStatus=0 2
+NoNewPrivileges=yes
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
[Install]
WantedBy=multi-user.target