summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rw-r--r--telegraf.service16
3 files changed, 8 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 190ca996a2fe..af63b5c617db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Nov 11 11:53:37 UTC 2016
+# Sun Nov 13 09:42:48 UTC 2016
pkgbase = telegraf
pkgdesc = Server-level metric gathering agent for InfluxDB
pkgver = 1.1.0
@@ -18,12 +18,10 @@ pkgbase = telegraf
source = telegraf.install
source = telegraf.sysusers
source = telegraf.tmpfiles
- source = telegraf.service
md5sums = SKIP
md5sums = d552ccaa62f0e839281641d07ebd397e
md5sums = 58cc9edf8fbf07e7d3a0357db78121b1
md5sums = 9c7a4df3556cab94837c432f5e46cf04
- md5sums = cd4d39cec1edf54ab2aa4b7599c81ecc
pkgname = telegraf
diff --git a/PKGBUILD b/PKGBUILD
index 18dea1917b0b..9b6bd47057f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,18 +15,17 @@ install="telegraf.install"
source=("git+https://github.com/influxdata/telegraf#tag=$pkgver"
'telegraf.install'
'telegraf.sysusers'
- 'telegraf.tmpfiles'
- 'telegraf.service')
+ 'telegraf.tmpfiles')
md5sums=('SKIP'
'd552ccaa62f0e839281641d07ebd397e'
'58cc9edf8fbf07e7d3a0357db78121b1'
- '9c7a4df3556cab94837c432f5e46cf04'
- 'cd4d39cec1edf54ab2aa4b7599c81ecc')
+ '9c7a4df3556cab94837c432f5e46cf04')
build()
{
export GOPATH="$srcdir"
- export PATH="$GOPATH/bin:$PATH"
+ export GOBIN="$GOPATH/bin"
+ export PATH="$GOBIN:$PATH"
mkdir -p "$GOPATH/src/github.com/influxdata"
mv -f "$srcdir/telegraf" "$GOPATH/src/github.com/influxdata/"
@@ -46,13 +45,12 @@ package()
cd $srcdir
install -Dm644 telegraf.sysusers "$pkgdir/usr/lib/sysusers.d/telegraf.conf"
install -Dm644 telegraf.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/telegraf.conf"
- install -Dm644 telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
- cd $GOPATH
- install -Dsm755 bin/telegraf "$pkgdir/usr/bin/telegraf"
+ cd $GOBIN
+ install -Dsm755 telegraf "$pkgdir/usr/bin/telegraf"
cd "$GOPATH/src/github.com/influxdata/telegraf"
- #install -Dm644 scripts/telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
+ install -Dm644 scripts/telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
install -Dm644 "etc/telegraf.conf" "$pkgdir/etc/telegraf/telegraf.conf"
mkdir "$pkgdir/etc/telegraf/telegraf.d"
install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/telegraf/LICENSE"
diff --git a/telegraf.service b/telegraf.service
deleted file mode 100644
index b129f967c845..000000000000
--- a/telegraf.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=The plugin-driven server agent for reporting metrics into InfluxDB
-Documentation=https://github.com/influxdata/telegraf
-After=network-online.target
-
-[Service]
-EnvironmentFile=-/etc/default/telegraf
-User=telegraf
-Group=telegraf
-ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ${TELEGRAF_OPTS}
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-KillMode=control-group
-
-[Install]
-WantedBy=multi-user.target