[arch-commits] Commit in grafana/repos/community-x86_64 (10 files)
Jelle van der Waa
jelle at gemini.archlinux.org
Fri Dec 10 17:53:54 UTC 2021
Date: Friday, December 10, 2021 @ 17:53:54
Author: jelle
Revision: 1068141
archrelease: copy trunk to community-x86_64
Added:
grafana/repos/community-x86_64/PKGBUILD
(from rev 1068140, grafana/trunk/PKGBUILD)
grafana/repos/community-x86_64/grafana.install
(from rev 1068140, grafana/trunk/grafana.install)
grafana/repos/community-x86_64/grafana.service
(from rev 1068140, grafana/trunk/grafana.service)
grafana/repos/community-x86_64/grafana.sysusers
(from rev 1068140, grafana/trunk/grafana.sysusers)
grafana/repos/community-x86_64/grafana.tmpfiles
(from rev 1068140, 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 | 198 ++++++++++++++++++++++++++---------------------------
grafana.install | 44 +++++------
grafana.service | 46 ++++++------
grafana.sysusers | 2
grafana.tmpfiles | 4 -
5 files changed, 147 insertions(+), 147 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-10 17:53:41 UTC (rev 1068140)
+++ PKGBUILD 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -1,99 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
-# Contributor: Gilles Hamel <hamelg at laposte dot net>
-
-pkgname=grafana
-pkgver=8.3.1
-pkgrel=1
-pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
-url='https://grafana.com/'
-arch=('x86_64')
-license=('Apache')
-depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts')
-makedepends=('git' 'go' 'npm' 'grunt-cli' 'python' 'nodejs' 'yarn')
-backup=('etc/grafana.ini')
-source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"
- 'grafana.service'
- 'grafana.sysusers'
- 'grafana.tmpfiles'
- )
-install=$pkgname.install
-sha512sums=('SKIP'
- '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850'
- '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4'
- 'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab')
-validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB"
- "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA"
- "AA70DF6234FBF96AB9101D09E6D5D452E87026E9" # https://github.com/aknuds1.gpg
- "622E7A764E0C94351E061C57F8D44788D50B48DF" # https://github.com/xlson.gpg
- "E9EBB044CD6A98482208FE569A774B897EAAB194" # https://github.com/torkelo.gpg
- "2E240E94A7ADC77A1DFE1085EBFE0FB04612DD4A" # https://github.com/marefr.gpg
- "5990A087E92D7E15FBF3161103BA4D7E39F0DAF8" # https://github.com/hugohaggmark.gpg
- "73B00FD007FF40A7B877F8E1C56C450B04996310" # https://github.com/mckn.gpg
- "3FEB0F042AF5DABD20CDB845539F8AEBA0B8E5DB" # https://github.com/dprokop.gpg
- "07B19EBA2380F3B0BE4DD234D2A1C6ABC44CEB74" # https://github.com/kylebrandt.gpg
- "721354FBE3B3088258A3123371A8B8168DFA6ECC") # https://github.com/wbrowne.gpg
-
-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
- echo "Applying patch ${filename##*/}"
- 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
-}
-
-build() {
- echo '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"
- cd grafana
- echo 'Generate golang'
- make gen-go
-
- echo 'building the backend'
- export CGO_LDFLAGS="${LDFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
- go run build.go setup
- go run build.go build
-
- echo 'building the frontend'
- export NPM_CONFIG_PREFIX="$srcdir/npm"
- export PATH+=":$NPM_CONFIG_PREFIX/bin"
- yarn install
- NODE_ENV=production yarn 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/linux-amd64/grafana-server "$pkgdir/usr/bin/grafana-server"
- install -Dsm755 bin/linux-amd64/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/"
- for i in public tools; do
- cp -r "$i" "$pkgdir/usr/share/grafana/$i"
- done
-
- # Remove unit tests
- rm -r "$pkgdir/usr/share/grafana/public/test"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: grafana/repos/community-x86_64/PKGBUILD (from rev 1068140, grafana/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -0,0 +1,99 @@
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
+# Contributor: Gilles Hamel <hamelg at laposte dot net>
+
+pkgname=grafana
+pkgver=8.3.2
+pkgrel=1
+pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
+url='https://grafana.com/'
+arch=('x86_64')
+license=('Apache')
+depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts')
+makedepends=('git' 'go' 'npm' 'grunt-cli' 'python' 'nodejs' 'yarn')
+backup=('etc/grafana.ini')
+source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"
+ 'grafana.service'
+ 'grafana.sysusers'
+ 'grafana.tmpfiles'
+ )
+install=$pkgname.install
+sha512sums=('SKIP'
+ '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850'
+ '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4'
+ 'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab')
+validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB"
+ "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA"
+ "AA70DF6234FBF96AB9101D09E6D5D452E87026E9" # https://github.com/aknuds1.gpg
+ "622E7A764E0C94351E061C57F8D44788D50B48DF" # https://github.com/xlson.gpg
+ "E9EBB044CD6A98482208FE569A774B897EAAB194" # https://github.com/torkelo.gpg
+ "2E240E94A7ADC77A1DFE1085EBFE0FB04612DD4A" # https://github.com/marefr.gpg
+ "5990A087E92D7E15FBF3161103BA4D7E39F0DAF8" # https://github.com/hugohaggmark.gpg
+ "73B00FD007FF40A7B877F8E1C56C450B04996310" # https://github.com/mckn.gpg
+ "3FEB0F042AF5DABD20CDB845539F8AEBA0B8E5DB" # https://github.com/dprokop.gpg
+ "07B19EBA2380F3B0BE4DD234D2A1C6ABC44CEB74" # https://github.com/kylebrandt.gpg
+ "721354FBE3B3088258A3123371A8B8168DFA6ECC") # https://github.com/wbrowne.gpg
+
+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
+ echo "Applying patch ${filename##*/}"
+ 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
+}
+
+build() {
+ echo '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"
+ cd grafana
+ echo 'Generate golang'
+ make gen-go
+
+ echo 'building the backend'
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
+ go run build.go setup
+ go run build.go build
+
+ echo 'building the frontend'
+ export NPM_CONFIG_PREFIX="$srcdir/npm"
+ export PATH+=":$NPM_CONFIG_PREFIX/bin"
+ yarn install
+ NODE_ENV=production yarn 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/linux-amd64/grafana-server "$pkgdir/usr/bin/grafana-server"
+ install -Dsm755 bin/linux-amd64/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/"
+ for i in public tools; do
+ cp -r "$i" "$pkgdir/usr/share/grafana/$i"
+ done
+
+ # Remove unit tests
+ rm -r "$pkgdir/usr/share/grafana/public/test"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: grafana.install
===================================================================
--- grafana.install 2021-12-10 17:53:41 UTC (rev 1068140)
+++ grafana.install 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -1,22 +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
- 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:
Copied: grafana/repos/community-x86_64/grafana.install (from rev 1068140, grafana/trunk/grafana.install)
===================================================================
--- grafana.install (rev 0)
+++ grafana.install 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -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 2021-12-10 17:53:41 UTC (rev 1068140)
+++ grafana.service 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -1,23 +0,0 @@
-[Unit]
-Description=Grafana service
-After=network.target postgresql.service mariadb.service mysqld.service
-
-[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
-NoNewPrivileges=yes
-ProtectSystem=full
-ProtectHome=true
-PrivateTmp=true
-PrivateDevices=true
-ProtectKernelTunables=true
-ProtectKernelModules=true
-ProtectControlGroups=true
-
-[Install]
-WantedBy=multi-user.target
Copied: grafana/repos/community-x86_64/grafana.service (from rev 1068140, grafana/trunk/grafana.service)
===================================================================
--- grafana.service (rev 0)
+++ grafana.service 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -0,0 +1,23 @@
+[Unit]
+Description=Grafana service
+After=network.target postgresql.service mariadb.service mysqld.service
+
+[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
+NoNewPrivileges=yes
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+
+[Install]
+WantedBy=multi-user.target
Deleted: grafana.sysusers
===================================================================
--- grafana.sysusers 2021-12-10 17:53:41 UTC (rev 1068140)
+++ grafana.sysusers 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -1 +0,0 @@
-u grafana 207 - /var/lib/grafana
Copied: grafana/repos/community-x86_64/grafana.sysusers (from rev 1068140, grafana/trunk/grafana.sysusers)
===================================================================
--- grafana.sysusers (rev 0)
+++ grafana.sysusers 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -0,0 +1 @@
+u grafana 207 - /var/lib/grafana
Deleted: grafana.tmpfiles
===================================================================
--- grafana.tmpfiles 2021-12-10 17:53:41 UTC (rev 1068140)
+++ grafana.tmpfiles 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -1,2 +0,0 @@
-d /var/lib/grafana 0750 grafana grafana -
-d /var/log/grafana 0750 grafana grafana -
Copied: grafana/repos/community-x86_64/grafana.tmpfiles (from rev 1068140, grafana/trunk/grafana.tmpfiles)
===================================================================
--- grafana.tmpfiles (rev 0)
+++ grafana.tmpfiles 2021-12-10 17:53:54 UTC (rev 1068141)
@@ -0,0 +1,2 @@
+d /var/lib/grafana 0750 grafana grafana -
+d /var/log/grafana 0750 grafana grafana -
More information about the arch-commits
mailing list