update pkgver to 20180309, systemd-sysusers

4 files changed, 16 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58b755747991..e05b86c4f9dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 23:04:19 UTC 2017
+# Tue Mar 20 20:51:25 UTC 2018
 pkgbase = libbitcoin-node-git
 	pkgdesc = Bitcoin Full Node
-	pkgver = 20170307
-	pkgrel = 5
+	pkgver = 20180309
+	pkgrel = 1
 	url = https://github.com/libbitcoin/libbitcoin-node
 	install = bn.install
 	arch = i686
@@ -38,11 +38,13 @@ pkgbase = libbitcoin-node-git
 	source = bn.logrotate
 	source = bn-init.service
 	source = bn.service
+	source = obelisk-sysusers.conf
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = f291f3b70b430657e92fd165d6a0ebded28681ce57ab1fdb20e9324d4c68da8e
 	sha256sums = b1da043ad40e0d80519b32a8b01a66d0fb47a6d2b19e2b7ad3f1b14b6d689bdd
 	sha256sums = d3730c0c1e0fc85dec828daef1d92113a6a79f6245617934113f4b31af75bc43
+	sha256sums = 17de557ac9b8a4d354ade339904286fa074facea539984e97b5e83f45a2c305f
 
 pkgname = libbitcoin-node-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b55ea4469cc..5ef692749016 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Andy Weidenbaum <archbaum@gmail.com>
 
 pkgname=libbitcoin-node-git
-pkgver=20170307
-pkgrel=5
+pkgver=20180309
+pkgrel=1
 pkgdesc="Bitcoin Full Node"
 arch=('i686' 'x86_64')
 depends=('boost'
@@ -30,12 +30,14 @@ source=(git+https://github.com/libbitcoin/libbitcoin-node
         git+https://github.com/libbitcoin/libbitcoin-node.wiki
         bn.logrotate
         bn-init.service
-        bn.service)
+        bn.service
+        obelisk-sysusers.conf)
 sha256sums=('SKIP'
             'SKIP'
             'f291f3b70b430657e92fd165d6a0ebded28681ce57ab1fdb20e9324d4c68da8e'
             'b1da043ad40e0d80519b32a8b01a66d0fb47a6d2b19e2b7ad3f1b14b6d689bdd'
-            'd3730c0c1e0fc85dec828daef1d92113a6a79f6245617934113f4b31af75bc43')
+            'd3730c0c1e0fc85dec828daef1d92113a6a79f6245617934113f4b31af75bc43'
+            '17de557ac9b8a4d354ade339904286fa074facea539984e97b5e83f45a2c305f')
 provides=('libbitcoin-node')
 conflicts=('libbitcoin-node')
 backup=('etc/obelisk/bn/bn.cfg'
@@ -115,6 +117,10 @@ package() {
   install -Dm 644 "$srcdir/bn-init.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 644 "$srcdir/bn.service" -t "$pkgdir/usr/lib/systemd/system"
 
+  msg2 'Installing systemd sysusers configuration file...'
+  install -Dm 644 "$srcdir/obelisk-sysusers.conf" \
+    "$pkgdir/usr/lib/sysusers.d/obelisk.conf"
+
   msg2 'Installing logrotate conf...'
   install -Dm 644 "$srcdir/bn.logrotate" "$pkgdir/etc/logrotate.d/bn"
 
diff --git a/bn.install b/bn.install
index 80ee8b1ef3b2..5795c9476f82 100644
--- a/bn.install
+++ b/bn.install
@@ -2,7 +2,6 @@ _bn_user=obelisk
 _bn_group=obelisk
 
 post_install() {
-  _mkuser
   chown -R $_bn_user:$_bn_group /etc/obelisk /srv/obelisk /var/log/obelisk
   printf "%b\n" "$obelisk"
 }
@@ -12,25 +11,9 @@ post_upgrade() {
 }
 
 post_remove() {
-  _rmuser
   rm -rf /etc/obelisk /srv/obelisk /var/log/obelisk
 }
 
-_mkuser() {
-  getent passwd $_bn_user &>/dev/null || {
-    echo -n "Creating obelisk user... "
-    grep -E "^$_bn_group:" /etc/group >/dev/null || groupadd $_bn_group
-    useradd -m -d /etc/obelisk -g $_bn_group -s /usr/bin/nologin $_bn_user
-    echo "done"
-  }
-}
-
-_rmuser() {
-  echo -n "Removing obelisk user... "
-  userdel -rf $_bn_user 2>/dev/null
-  echo "done"
-}
-
 read -d '' obelisk <<'EOF'
 ########################################################################
 ########################################################################
diff --git a/obelisk-sysusers.conf b/obelisk-sysusers.conf
new file mode 100644
index 000000000000..ba4096536c57
--- /dev/null
+++ b/obelisk-sysusers.conf
@@ -0,0 +1 @@
+u obelisk - "libbitcoin node/server user" /etc/obelisk -