openbazaard-git: updated

5 files changed, 16 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3338a3dec34..2be21799924e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sun Dec 31 16:27:35 UTC 2017
 pkgbase = openbazaard-git
 	pkgdesc = Server daemon for communication between client and OpenBazaar network (Latest devel version)
-	pkgver = v0.11.0.rc1.r7.g73d649f4
+	pkgver = v0.11.0.rc2.r1.g8540a8a1
 	pkgrel = 1
 	url = http://openbazaar.org
-	install = openbazaard.install
 	arch = arm
 	arch = armv6h
 	arch = armv7h
@@ -21,8 +18,10 @@ pkgbase = openbazaard-git
 	options = upx
 	source = openbazaar-go::git+https://github.com/OpenBazaar/openbazaar-go.git
 	source = openbazaard.service
+	source = openbazaard.conf
 	md5sums = SKIP
-	md5sums = 9737f9240006f5b215b128c25f68f6f4
+	md5sums = a6ee246f8be0b85697eca8d9a86014cd
+	md5sums = 93ff9255cb400c6748f6cb45a5456962
 
 pkgname = openbazaard-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 37f968f74a12..341786299413 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 _pkgname=openbazaard
 pkgname=${_pkgname}-git
-pkgver=v0.11.0.rc1.r7.g73d649f4
+pkgver=v0.11.0.rc2.r1.g8540a8a1
 pkgrel=1
 pkgdesc="Server daemon for communication between client and OpenBazaar network (Latest devel version)"
 arch=(arm armv6h armv7h aarch64 i686 x86_64)
 url="http://openbazaar.org"
 license=('MIT')
 depends=()
-install=${_pkgname}.install
+#install=${_pkgname}.install
 makedepends=(go git upx)
 conflicts=('openbazaard')
 options=('strip' 'upx')
@@ -17,7 +17,8 @@ _user=github.com/OpenBazaar
 _repo=openbazaar-go
 
 source=("${_repo}::git+https://${_user}/${_repo}.git"
-	"${_pkgname}.service")
+	"${_pkgname}.service"
+	"${_pkgname}.conf")
 
 export GOOS=linux
 case "$CARCH" in
@@ -51,19 +52,15 @@ package() {
 
   go build
   
-  msg2 "Installing binary file"
   install -Dm755 "$GOPATH"/bin/${_repo} $pkgdir/usr/bin/${_pkgname}
 
-  msg2 "Creating user folder"
-  install -d -m0700 -o 44 -g 44  $pkgdir/var/lib/${_pkgname}
-
-  msg2 "Installing systemd service"
   install -Dm644 $srcdir/${_pkgname}.service $pkgdir/usr/lib/systemd/system/${_pkgname}.service
+  install -D -m644 "${srcdir}/${_pkgname}".conf "$pkgdir/etc/conf.d/${_pkgname}"
   
-  msg2 "Symlinking for gui launch"
   install -dm755 $pkgdir/opt/openbazaar-go/
   ln -sr /usr/bin/${_pkgname} $pkgdir/opt/openbazaar-go/openbazaard
 }
 
 md5sums=('SKIP'
-         '9737f9240006f5b215b128c25f68f6f4')
+         'a6ee246f8be0b85697eca8d9a86014cd'
+         '93ff9255cb400c6748f6cb45a5456962')
diff --git a/openbazaard.conf b/openbazaard.conf
new file mode 100644
index 000000000000..fb880b4523df
--- /dev/null
+++ b/openbazaard.conf
@@ -0,0 +1 @@
+OB_ARGS="-d /var/lib/openbazaard"
diff --git a/openbazaard.install b/openbazaard.install
deleted file mode 100644
index b8b8be4af650..000000000000
--- a/openbazaard.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  if [ ! -d /var/lib/openbazaard ]; then
-    groupadd -g 44 openbazaar &>/dev/null
-    useradd -u 44 -g openbazaar -d /var/lib/openbazaard -s /bin/false openbazaar &> /dev/null
-  fi
-}
diff --git a/openbazaard.service b/openbazaard.service
index 7466b8a471c2..5396712122d3 100644
--- a/openbazaard.service
+++ b/openbazaard.service
@@ -5,14 +5,13 @@ After=network.target
 [Service]
 Type=simple
 User=openbazaar
-TimeoutSec=0
-ExecStart=/usr/bin/openbazaard start
+DynamicUser=yes
+EnvironmentFile=/etc/conf.d/openbazaard
+StateDirectory=openbazaard
+ExecStart=/usr/bin/openbazaard start $OB_ARGS
 ExecStop=/usr/bin/openbazaard stop
 ExecReload=/usr/bin/openbazaard restart
 
-## Security
-InaccessibleDirectories=/home
-
 [Install]
 WantedBy=multi-user.target