[arch-commits] Commit in grafana/trunk (PKGBUILD grafana.service)

[Jelle van der Waa via arch-commits]

Date: Tuesday, September 3, 2019 @ 10:55:25
  Author: jelle
Revision: 507393

upgpkg: grafana 6.3.5-1

Upstream update, fix fs#63231.

Modified:
  grafana/trunk/PKGBUILD
  grafana/trunk/grafana.service

-+
 PKGBUILD|4 ++--
 grafana.service |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-03 10:53:32 UTC (rev 507392)
+++ PKGBUILD2019-09-03 10:55:25 UTC (rev 507393)
@@ -3,7 +3,7 @@
 # Contributor: Gilles Hamel 
 
 pkgname=grafana
-pkgver=6.3.4
+pkgver=6.3.5
 pkgrel=1
 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & 
OpenTSDB'
 url='https://grafana.com/'
@@ -19,7 +19,7 @@
)
 install=$pkgname.install
 sha512sums=('SKIP'
-
'4663d4f9ccffc3926a0f19088e0efcac76f6d464d7d53e3ecb448fde81ac0855d06935987b11b0608d63c71f76b0b15adce5e6248d28303f1ebb263347094a9a'
+
'02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850'
 
'38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4'
 
'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab')
 

Modified: grafana.service
===
--- grafana.service 2019-09-03 10:53:32 UTC (rev 507392)
+++ grafana.service 2019-09-03 10:55:25 UTC (rev 507393)
@@ -1,6 +1,6 @@
 [Unit]
 Description=Grafana service
-After=network.target
+After=network.target postgresql.service mariadb.service mysqld.service
 
 [Service]
 User=grafana

[arch-commits] Commit in grafana/trunk (PKGBUILD grafana.service grafana.tmpfiles)

[Sébastien Luttringer via arch-commits]

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
===
--- PKGBUILD2019-01-01 13:42:45 UTC (rev 420153)
+++ PKGBUILD2019-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.tmpfiles2019-01-01 13:42:45 UTC (rev 420153)
+++ grafana.tmpfiles2019-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

[arch-commits] Commit in grafana/trunk (PKGBUILD grafana.service)

[Sébastien Luttringer via arch-commits]

Date: Saturday, December 15, 2018 @ 21:40:37
  Author: seblu
Revision: 416416

upgpkg: grafana 5.4.2-2

- FS#61089

Modified:
  grafana/trunk/PKGBUILD
  grafana/trunk/grafana.service

-+
 PKGBUILD|4 ++--
 grafana.service |8 
 2 files changed, 10 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-15 21:03:49 UTC (rev 416415)
+++ PKGBUILD2018-12-15 21:40:37 UTC (rev 416416)
@@ -4,7 +4,7 @@
 
 pkgname=grafana
 pkgver=5.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & 
OpenTSDB'
 url='http://grafana.org'
 arch=('x86_64')
@@ -19,7 +19,7 @@
)
 install=$pkgname.install
 md5sums=('SKIP'
- '2f1d73689923ecee92a102a65b91003a'
+ '91de91702c9982073fe626d00c0e0f44'
  'e991d8cdf91c1e25652cdbc51fc726c5'
  'b9b576d1959fc063b3399892e201488c')
 

Modified: grafana.service
===
--- grafana.service 2018-12-15 21:03:49 UTC (rev 416415)
+++ grafana.service 2018-12-15 21:40:37 UTC (rev 416416)
@@ -10,6 +10,14 @@
 LimitNOFILE=1
 TimeoutStopSec=20
 SuccessExitStatus=0 2
+NoNewPrivileges=yes
+ProtectSystem=strict
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
 
 [Install]
 WantedBy=multi-user.target