clean up PKGBUILD code

5 files changed, 65 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2afa71ecf51..2b4504eb753c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Aug 31 06:33:49 UTC 2016
+# Wed Sep  7 15:02:47 UTC 2016
 pkgbase = telegraf
 	pkgdesc = Server-level metric gathering agent for InfluxDB
 	pkgver = 0.13.2
@@ -10,12 +10,18 @@ pkgbase = telegraf
 	arch = x86_64
 	license = MIT
 	makedepends = go
-	makedepends = godep
 	makedepends = git
+	depends = go
 	provides = telegraf
 	backup = etc/telegraf/telegraf.conf
+	source = git+https://github.com/influxdata/telegraf#tag=0.13.2
 	source = telegraf.install
+	source = telegraf.sysusers
+	source = telegraf.service
 	md5sums = SKIP
+	md5sums = 9b2c2ba850bdb13e08bdfbfbc05a3a06
+	md5sums = 58cc9edf8fbf07e7d3a0357db78121b1
+	md5sums = cd4d39cec1edf54ab2aa4b7599c81ecc
 
 pkgname = telegraf
 
diff --git a/PKGBUILD b/PKGBUILD
index c61922647b82..1c1e659fc959 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,63 +3,54 @@
 pkgname='telegraf'
 pkgver='0.13.2'
 pkgrel='1'
-epoch=
 pkgdesc='Server-level metric gathering agent for InfluxDB'
 arch=('i686' 'x86_64')
 url='http://influxdb.org/'
 license=('MIT')
-groups=()
-depends=()
-makedepends=('go' 'godep' 'git')
-checkdepends=()
-optdepends=()
+depends=('go')
+makedepends=('go' 'git')
 provides=('telegraf')
-conflicts=()
-replaces=()
 backup=('etc/telegraf/telegraf.conf')
-options=()
-install="$pkgname.install"
-source=("$pkgname.install")
-changelog=
-noextract=()
-md5sums=('SKIP')
+install="telegraf.install"
+source=("git+https://github.com/influxdata/telegraf#tag=$pkgver"
+        'telegraf.install'
+        'telegraf.sysusers'
+				'telegraf.service')
+md5sums=('SKIP'
+         '9b2c2ba850bdb13e08bdfbfbc05a3a06'
+         '58cc9edf8fbf07e7d3a0357db78121b1'
+         'cd4d39cec1edf54ab2aa4b7599c81ecc')
 
-prepare()
+build()
 {
   export GOPATH="$srcdir"
-  export GOBIN="$GOPATH/bin"
-  export TELEGRAFPATCH="$GOPATH/src/github.com/influxdata/telegraf"
-  if [ -d $GOBIN ]; then
-    rm -rf $GOBIN;
-  fi;
+  export PATH="$PATH:$GOPATH/bin"
+  mkdir -p "$GOPATH/src/github.com/influxdata"
+  mv -f "$srcdir/telegraf" "$GOPATH/src/github.com/influxdata/"
 
-  go get -v github.com/influxdata/telegraf
-  cd $TELEGRAFPATCH
-  git checkout $pkgver
-  go get -v github.com/sparrc/gdm
-  $GOBIN/gdm restore
-}
-build()
-{
-  echo "Building $pkgname version=${pkgver} ..."
-  cd $TELEGRAFPATCH
-  go build -o telegraf -ldflags="-X main.Version=$pkgver" cmd/telegraf/telegraf.go
+  cd "$GOPATH/src/github.com/influxdata/telegraf"
+
+  echo "Downloading dependencies"
+  go get github.com/sparrc/gdm
+  gdm restore
+
+  revision=`git rev-parse HEAD`
+  version=`git describe --tags`
+  echo "Building telegraf version=$version commit=$revision branch=master"
+	go install -ldflags="-X main.Version=$version -X main.commit=$revision -X main.branch=master" ./...
 }
 package()
 {
-  # systemctl service file
-  install -D -m644  "$TELEGRAFPATCH/scripts/telegraf.service" "$pkgdir/usr/lib/systemd/system/telegraf.service"
-  sed -i 's;/etc/opt/telegraf;/etc/telegraf;g' "$pkgdir/usr/lib/systemd/system/telegraf.service"
-  sed -i 's;/opt/telegraf;/usr/bin;g' "$pkgdir/usr/lib/systemd/system/telegraf.service"
-
-  # binaries
-  install -D -m755 "$TELEGRAFPATCH/telegraf" "$pkgdir/usr/bin/telegraf"
+ 	cd $srcdir
+  install -Dm644 telegraf.sysusers "$pkgdir/usr/lib/sysusers.d/telegraf.conf"
+  install -Dm644 telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
 
-  # configuration file
-  mkdir -p "$pkgdir/etc/telegraf"
-  mkdir -p "$pkgdir/etc/telegraf.d"
-  $TELEGRAFPATCH/telegraf -sample-config > "$pkgdir/etc/telegraf/telegraf.conf"
+  cd $GOPATH
+  install -Dsm755 bin/telegraf "$pkgdir/usr/bin/telegraf"
 
-  # license
-  install -Dm644 "$TELEGRAFPATCH/LICENSE" "$pkgdir/usr/share/licenses/telegraf/LICENSE"
+  cd "$GOPATH/src/github.com/influxdata/telegraf"
+  #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.install b/telegraf.install
index 5d838bfcaba6..1424e617892c 100644
--- a/telegraf.install
+++ b/telegraf.install
@@ -1,16 +1,9 @@
+#/bin/sh
+
+# arg 1:  the new package version
 post_install() {
-  post_upgrade
-  passwd -l telegraf &>/dev/null
+  systemd-sysusers telegraf.conf
 }
 
-post_upgrade() {
-  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-  getent group telegraf >/dev/null || groupadd telegraf
-  getent passwd telegraf >/dev/null || useradd -c 'telegraf' -g telegraf -d '/var/lib/telegraf' -m -s /bin/false telegraf
+# vim:set ts=2 sw=2 et:
 
-  mkdir -p /var/lib/telegraf
-  mkdir -p /var/log/telegraf
-  mkdir -p /etc/telegraf/telegraf.d
-  chown telegraf.telegraf /var/lib/telegraf
-  chown telegraf.telegraf /var/log/telegraf
-}
diff --git a/telegraf.service b/telegraf.service
new file mode 100644
index 000000000000..b129f967c845
--- /dev/null
+++ b/telegraf.service
@@ -0,0 +1,16 @@
+[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
diff --git a/telegraf.sysusers b/telegraf.sysusers
new file mode 100644
index 000000000000..98300a78c42d
--- /dev/null
+++ b/telegraf.sysusers
@@ -0,0 +1 @@
+u telegraf - - /etc/telegraf