Added sysusers, build from proper source

4 files changed, 42 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 209cbf5a20aa..1f575359fced 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,29 +8,41 @@ pkgdesc='Time-series data visualization tool for InfluxDB'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://influxdata.com/time-series-platform/chronograf/'
 license=('AGPL')
-conflicts=('chronograf')
-provides=('chronograf')
-depends=('glibc')
 makedepends=('go' 'git' 'make' 'npm' 'yarn' 'nodejs')
-
-prepare() {
-	export GOPATH=${srcdir}
-	/usr/bin/go get -d github.com/influxdata/${pkgname}
-}
+backup=('etc/chronograf/chronograf.conf')
+install="chronograf.install"
+source=("git+https://github.com/influxdata/chronograf#tag=$pkgver"
+        'chronograf.sysusers'
+        'chronograf.tmpfiles')
+md5sums=('SKIP'
+         'f02a4e7ce79a45bd2fe9473d9f7ec4a0'
+         '0943ea927d009b047729578658c69943')
 
 build() {
-	export GOPATH=${srcdir}
-	PATH="$PATH:$GOPATH/bin"
-	/usr/bin/go get -d github.com/influxdata/${pkgname}
-	cd "${GOPATH}"/src/github.com/influxdata/${pkgname}
+        export GOPATH="$srcdir"
+        export GOBIN="$GOPATH/bin"
+        export PATH="$GOBIN:$PATH"
+        mkdir -p "$GOPATH/src/github.com/influxdata"
+        mv -f "$srcdir/chronograf" "$GOPATH/src/github.com/influxdata/"
+
+        cd "$GOPATH/src/github.com/influxdata/chronograf"
+
+	# LDFLAGS being exported causes build errors
         unset LDFLAGS
 	make
 	/usr/bin/go install github.com/influxdata/${pkgname}/cmd/${pkgname}
 }
 
 package() {
-	mkdir -p "${pkgdir}/usr/bin"
-	mkdir -p "${pkgdir}/usr/lib/systemd/system"
-	install -Dm 644 "${srcdir}/src/github.com/influxdata/${pkgname}/etc/scripts/chronograf.service" "${pkgdir}/usr/lib/systemd/system/chronograf.service"
-	install -Dm 755 "${srcdir}/bin/${pkgname}" "${pkgdir}/usr/bin"
+	cd "$srcdir"
+	install -Dm644 chronograf.sysusers "$pkgdir/usr/lib/sysusers.d/chronograf.conf"
+	install -Dm644 chronograf.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/chronograf.conf"
+
+	cd "$GOBIN"
+	install -Dsm755 chronograf "$pkgdir/usr/bin/chronograf"
+
+	cd "$GOPATH/src/github.com/influxdata/chronograf"
+        install -Dm644 etc/scripts/chronograf.service \
+		"$pkgdir/usr/lib/systemd/system/chronograf.service"
+        install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chronograf/LICENSE"
 }
diff --git a/chronograf.install b/chronograf.install
new file mode 100644
index 000000000000..dcdecf3998d5
--- /dev/null
+++ b/chronograf.install
@@ -0,0 +1,11 @@
+post_install() {
+  systemd-sysusers /usr/lib/sysusers.d/chronograf.conf
+  systemd-tmpfiles --create /usr/lib/tmpfiles.d/chronograf.conf
+  systemctl daemon-reload
+}
+
+post_upgrade() {
+  systemctl daemon-reload
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/chronograf.sysusers b/chronograf.sysusers
new file mode 100644
index 000000000000..6abc21d2e4d2
--- /dev/null
+++ b/chronograf.sysusers
@@ -0,0 +1 @@
+u chronograf - - 
diff --git a/chronograf.tmpfiles b/chronograf.tmpfiles
new file mode 100644
index 000000000000..0e33454e6f90
--- /dev/null
+++ b/chronograf.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/chronograf   0755 chronograf chronograf
+x /var/lib/chronograf/*