[arch-commits] Commit in grafana/repos/community-x86_64 (10 files)

Sébastien Luttringer seblu at archlinux.org
Wed Sep 6 00:49:27 UTC 2017


    Date: Wednesday, September 6, 2017 @ 00:49:25
  Author: seblu
Revision: 255913

archrelease: copy trunk to community-x86_64

Added:
  grafana/repos/community-x86_64/PKGBUILD
    (from rev 255912, grafana/trunk/PKGBUILD)
  grafana/repos/community-x86_64/grafana.install
    (from rev 255912, grafana/trunk/grafana.install)
  grafana/repos/community-x86_64/grafana.service
    (from rev 255912, grafana/trunk/grafana.service)
  grafana/repos/community-x86_64/grafana.sysusers
    (from rev 255912, grafana/trunk/grafana.sysusers)
  grafana/repos/community-x86_64/grafana.tmpfiles
    (from rev 255912, grafana/trunk/grafana.tmpfiles)
Deleted:
  grafana/repos/community-x86_64/PKGBUILD
  grafana/repos/community-x86_64/grafana.install
  grafana/repos/community-x86_64/grafana.service
  grafana/repos/community-x86_64/grafana.sysusers
  grafana/repos/community-x86_64/grafana.tmpfiles

------------------+
 PKGBUILD         |  148 ++++++++++++++++++++++++++---------------------------
 grafana.install  |   35 +++++++-----
 grafana.service  |   30 +++++-----
 grafana.sysusers |    2 
 grafana.tmpfiles |    6 +-
 5 files changed, 115 insertions(+), 106 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-06 00:48:55 UTC (rev 255912)
+++ PKGBUILD	2017-09-06 00:49:25 UTC (rev 255913)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
-# Contributor: Gilles Hamel <hamelg at laposte dot net>
-
-pkgname=grafana
-pkgver=4.3.2
-pkgrel=1
-pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
-url='http://grafana.org'
-arch=('x86_64' 'i686')
-license=('Apache')
-depends=('glibc' 'freetype2' 'fontconfig')
-makedepends=('git' 'go' 'npm' 'grunt-cli')
-backup=("etc/grafana.ini")
-source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"
-        "grafana.service"
-        "grafana.sysusers"
-        "grafana.tmpfiles"
-       )
-install=$pkgname.install
-md5sums=('SKIP'
-         '2f1d73689923ecee92a102a65b91003a'
-         '49688ed04bb3fac45fd48d0ac99e52d5'
-         'a23177c9e555a7d8ede65c86cf21add2')
-
-prepare() {
-  cd $pkgname
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      msg2 "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
-  done
-  :
-}
-
-build() {
-  msg2 'GOPATH setup'
-  export GOPATH="$srcdir/gopath"
-  export PATH+=":$GOPATH/bin"
-  mkdir -p "$GOPATH/src/github.com/grafana/"
-  ln -fsrT "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana"
-  cd "$GOPATH/src/github.com/grafana/grafana"
-
-  msg2 'building the backend'
-  go run build.go setup build
-
-  msg2 'building the frontend'
-  export NPM_CONFIG_PREFIX="$srcdir/npm"
-  export PATH+=":$NPM_CONFIG_PREFIX/bin"
-  npm install -g yarn
-  yarn install --pure-lockfile --no-progress
-  npm run build
-}
-
-package() {
-  install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf"
-  install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf"
-  install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service"
-  cd $pkgname
-  install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
-  install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli"
-  install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini"
-  install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini"
-  install -dm755 "$pkgdir/usr/share/grafana/"
-  cp -r vendor "$pkgdir/usr/share/grafana/"
-  cp -r public_gen "$pkgdir/usr/share/grafana/public"
-  ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: grafana/repos/community-x86_64/PKGBUILD (from rev 255912, grafana/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-09-06 00:49:25 UTC (rev 255913)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
+# Contributor: Gilles Hamel <hamelg at laposte dot net>
+
+pkgname=grafana
+pkgver=4.4.3
+pkgrel=1
+pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
+url='http://grafana.org'
+arch=('x86_64')
+license=('Apache')
+depends=('glibc' 'freetype2' 'fontconfig')
+makedepends=('git' 'go' '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"
+       )
+install=$pkgname.install
+md5sums=('SKIP'
+         '2f1d73689923ecee92a102a65b91003a'
+         'e991d8cdf91c1e25652cdbc51fc726c5'
+         'b9b576d1959fc063b3399892e201488c')
+
+prepare() {
+  cd $pkgname
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -i "$srcdir/${filename##*/}"
+    fi
+  done
+  :
+}
+
+build() {
+  msg2 'GOPATH setup'
+  export GOPATH="$srcdir/gopath"
+  export PATH+=":$GOPATH/bin"
+  mkdir -p "$GOPATH/src/github.com/grafana/"
+  ln -fsrT "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana"
+  cd "$GOPATH/src/github.com/grafana/grafana"
+
+  msg2 'building the backend'
+  go run build.go setup build
+
+  msg2 'building the frontend'
+  export NPM_CONFIG_PREFIX="$srcdir/npm"
+  export PATH+=":$NPM_CONFIG_PREFIX/bin"
+  npm install -g yarn
+  yarn install --pure-lockfile --no-progress
+  npm run build release
+}
+
+package() {
+  install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf"
+  install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf"
+  install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service"
+  cd $pkgname
+  install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
+  install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli"
+  install -Dm640 -o207 -g207 conf/sample.ini "$pkgdir/etc/$pkgname.ini"
+  install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini"
+  install -dm755 "$pkgdir/usr/share/grafana/"
+  cp -r vendor "$pkgdir/usr/share/grafana/"
+  cp -r public_gen "$pkgdir/usr/share/grafana/public"
+  ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: grafana.install
===================================================================
--- grafana.install	2017-09-06 00:48:55 UTC (rev 255912)
+++ grafana.install	2017-09-06 00:49:25 UTC (rev 255913)
@@ -1,13 +0,0 @@
-#/bin/sh
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if (( "$(vercmp $2 2.6.0-3)" < 0 )); then
-		echo '==> Configuration moved to /etc/grafana.ini'
-	fi
-  return 0
-}
-
-
-# vim:set ts=2 sw=2 et:

Copied: grafana/repos/community-x86_64/grafana.install (from rev 255912, grafana/trunk/grafana.install)
===================================================================
--- grafana.install	                        (rev 0)
+++ grafana.install	2017-09-06 00:49:25 UTC (rev 255913)
@@ -0,0 +1,22 @@
+#/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( "$(vercmp $2 2.6.0-3)" < 0 )); then
+    echo '==> Configuration moved to /etc/grafana.ini'
+  fi
+  if (( "$(vercmp $2 4.4.3-1)" < 0 )); then
+    echo '==> Grafana now uses static UID/GID 207'
+    echo '==> Trying to update your previous UID/GID'
+    if ! { usermod -u 207 grafana && groupmod -g 207 grafana &&
+      chown -R 207:207 /var/{lib,log}/grafana; }; then
+      echo '==> Automatic GID/UID change failed. Do it manually!'
+      echo '==> usermod -g 207 grafana && groupmod -u 207 grafana && chown -R 207:207 /var/l{ib,og}/grafana'
+    fi
+    echo '==> Check the ownership of your files!'
+  fi
+  return 0
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: grafana.service
===================================================================
--- grafana.service	2017-09-06 00:48:55 UTC (rev 255912)
+++ grafana.service	2017-09-06 00:49:25 UTC (rev 255913)
@@ -1,15 +0,0 @@
-[Unit]
-Description=Grafana service
-After=network.target
-
-[Service]
-User=grafana
-Group=grafana
-WorkingDirectory=/usr/share/grafana
-ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini
-LimitNOFILE=10000
-TimeoutStopSec=20
-SuccessExitStatus=0 2
-
-[Install]
-WantedBy=multi-user.target

Copied: grafana/repos/community-x86_64/grafana.service (from rev 255912, grafana/trunk/grafana.service)
===================================================================
--- grafana.service	                        (rev 0)
+++ grafana.service	2017-09-06 00:49:25 UTC (rev 255913)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Grafana service
+After=network.target
+
+[Service]
+User=grafana
+Group=grafana
+WorkingDirectory=/usr/share/grafana
+ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini
+LimitNOFILE=10000
+TimeoutStopSec=20
+SuccessExitStatus=0 2
+
+[Install]
+WantedBy=multi-user.target

Deleted: grafana.sysusers
===================================================================
--- grafana.sysusers	2017-09-06 00:48:55 UTC (rev 255912)
+++ grafana.sysusers	2017-09-06 00:49:25 UTC (rev 255913)
@@ -1 +0,0 @@
-u grafana - - /var/lib/grafana

Copied: grafana/repos/community-x86_64/grafana.sysusers (from rev 255912, grafana/trunk/grafana.sysusers)
===================================================================
--- grafana.sysusers	                        (rev 0)
+++ grafana.sysusers	2017-09-06 00:49:25 UTC (rev 255913)
@@ -0,0 +1 @@
+u grafana 207 - /var/lib/grafana

Deleted: grafana.tmpfiles
===================================================================
--- grafana.tmpfiles	2017-09-06 00:48:55 UTC (rev 255912)
+++ grafana.tmpfiles	2017-09-06 00:49:25 UTC (rev 255913)
@@ -1,3 +0,0 @@
-d /var/lib/grafana 0755 grafana grafana -
-d /var/log/grafana 0755 grafana grafana -
-L /var/lib/grafana/log - - - - ../../log/grafana

Copied: grafana/repos/community-x86_64/grafana.tmpfiles (from rev 255912, grafana/trunk/grafana.tmpfiles)
===================================================================
--- grafana.tmpfiles	                        (rev 0)
+++ grafana.tmpfiles	2017-09-06 00:49:25 UTC (rev 255913)
@@ -0,0 +1,3 @@
+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