Update to: v0.9.0.rc33.r80.ged4d009-1 - Fixed incorrect directories in default config. Removed unnecessary deps. Changed group to be a system group

4 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff4911ae8239..62b2b88d1394 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = influxdb-git
 	pkgdesc = Scalable datastore for metrics, events, and real-time analytics
-	pkgver = v0.9.0.rc31.r74.g1fb9c54
+	pkgver = v0.9.0.rc33.r80.ged4d009
 	pkgrel = 1
 	url = http://influxdb.org/
 	install = influxdb.install
@@ -15,16 +15,13 @@ pkgbase = influxdb-git
 	makedepends = gawk
 	makedepends = mercurial
 	makedepends = git
-	depends = leveldb
-	depends = rocksdb
-	provides = influxdb
 	backup = etc/influxdb.conf
 	source = git+https://github.com/influxdb/influxdb.git
 	source = influxdb.service
 	source = influxdb.install
 	md5sums = SKIP
 	md5sums = a73293aa5489a70bdfa01f8a5dfee359
-	md5sums = 56d2385232a6be54df21ec890d66f00c
+	md5sums = 37772f833acd9f5f8ac9c2bd3f1c3be8
 
 pkgname = influxdb-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4741610f131c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+*
+!PKGBUILD
+!.SRCINFO
+!*.patch
+!*.desktop
+!*.install
+!*.service
+!*.sh
+!*.conf
+!.gitignore
+influxdb
diff --git a/PKGBUILD b/PKGBUILD
index 71b4d07fef9e..ff96d5ca525f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname='influxdb'
 pkgname="$_pkgname-git"
-pkgver=v0.9.0.rc31.r74.g1fb9c54
+pkgver=v0.9.0.rc33.r80.ged4d009
 pkgrel=1
 epoch=
 pkgdesc='Scalable datastore for metrics, events, and real-time analytics'
@@ -14,11 +14,9 @@ arch=('i686' 'x86_64')
 url='http://influxdb.org/'
 license=('MIT')
 groups=()
-depends=('leveldb' 'rocksdb')
 makedepends=('autoconf' 'protobuf' 'bison' 'flex' 'go' 'gawk' 'mercurial' 'git')
 checkdepends=()
-optdepends=()
-provides=('influxdb')
+
 conflicts=()
 replaces=()
 backup=('etc/influxdb.conf')
@@ -31,7 +29,7 @@ source=("git+https://github.com/influxdb/influxdb.git"
 noextract=()
 md5sums=('SKIP'
          'a73293aa5489a70bdfa01f8a5dfee359'
-         '56d2385232a6be54df21ec890d66f00c')
+         '37772f833acd9f5f8ac9c2bd3f1c3be8')
 
 pkgver() {
 	cd "$_pkgname"
@@ -46,6 +44,8 @@ build() {
 	go get -u -f ./...
 	go build ./...
 	go install ./...
+
+	sed -i 's|/var/opt|/var/lib|g' etc/config.sample.toml
 }
 
 check() {
@@ -59,16 +59,11 @@ package() {
   # systemctl service file
   install -D -m644  "$srcdir/influxdb.service" "$pkgdir/usr/lib/systemd/system/influxdb.service"
 
-  cd "$srcdir/src/github.com/influxdb/influxdb"
-
   # influxdb binary
   install -D -m755 "$srcdir/bin/influx" "$pkgdir/usr/bin/influx"
   install -D -m755 "$srcdir/bin/influxd" "$pkgdir/usr/bin/influxd"
   install -D -m755 "$srcdir/bin/urlgen" "$pkgdir/usr/bin/urlgen"
 
   # configuration file
-  cd etc
-  sed -i 's|/var/opt/influxdb/raft|/var/lib/influxdb/raft|g' config.sample.toml
-  sed -i 's|/var/opt/influxdb/db|/var/lib/influxdb/db|g' config.sample.toml
-  install -D -m644 config.sample.toml "$pkgdir/etc/influxdb.conf"
+  install -D -m644 "$srcdir/src/github.com/influxdb/influxdb/etc/config.sample.toml" "$pkgdir/etc/influxdb.conf"
 }
diff --git a/influxdb.install b/influxdb.install
index 1e90c6513af7..8d0db568fc83 100644
--- a/influxdb.install
+++ b/influxdb.install
@@ -1,14 +1,12 @@
 post_install() {
   post_upgrade
-  passwd -l influxdb &>/dev/null
 }
 
 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 influxdb >/dev/null || groupadd influxdb
+  getent group influxdb >/dev/null || groupadd -r influxdb
   getent passwd influxdb >/dev/null || useradd -c 'InfluxDB' -r -g influxdb -d '/var/lib/influxdb' -m -s /bin/bash influxdb
-  mkdir -p /var/lib/influxdb/db
-  mkdir -p /var/lib/influxdb/raft
+  mkdir -p /var/lib/influxdb/{db,raft,hh}
   chown influxdb:influxdb -R /var/lib/influxdb
 
   mkdir -p /var/log/influxdb