systemd template

3 files changed, 17 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d7b33744da3..0887f5e9c048 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pro-bitcoin-git
 	pkgdesc = Prometheus enabled bitcoin node
-	pkgver = v22.0.r3.g051d93856
+	pkgver = v22.0.r34.gac9bdd94b
 	pkgrel = 1
 	url = https://github.com/pro-bitcoin/pro-bitcoin.git
 	arch = aarch64
@@ -21,13 +21,13 @@ pkgbase = pro-bitcoin-git
 	backup = etc/bitcoin/pro-bitcoin.conf
 	source = pro-bitcoin-git::git+https://github.com/pro-bitcoin/pro-bitcoin.git
 	source = pro-bitcoin.conf
-	source = pro-bitcoind.service
+	source = pro-bitcoind@.service
 	source = pro-bitcoin-sysusers.conf
 	source = pro-bitcoin-core-01-systemd-sysusers.hook
 	source = pro-bitcoin-core-02-chown.hook
 	sha256sums = SKIP
-	sha256sums = 413b478091bfb75c9221ae0a219618796be9f2ef06cec69252e473190074d85b
-	sha256sums = 3612464934304423ad190802174992982b30c1c179cfea01d49389c0179fb77b
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = f126b4824e43d9760ab2021460a37d859986f07e1ac9245ee4938e832739f73a
 	sha256sums = 0ebed82d37ea78cbfc6fbbb3e5f38419efffded16d0e98b5d4d1bb0d75071f56
 	sha256sums = c1341e6cf6c511c3f1f91a39c5cccabd72549f8e064902f5f35b1f6fe8dff128
diff --git a/PKGBUILD b/PKGBUILD
index ca8563c75031..c6123046c0c6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Douglas Chimento <dchimento @ gmail.com>
 pkgname=pro-bitcoin-git
-pkgver=v22.0.r3.g051d93856
-pkgrel=1
+pkgver=v22.0.r34.gac9bdd94b
+pkgrel=2
 arch=('aarch64' 'armv6h' 'armv7h' 'i686' 'x86_64')
 url="https://pro-bitcoin.io"
 depends=('boost' 'boost-libs' 'zeromq' 'libevent')
@@ -15,13 +15,13 @@ makedepends=('cmake' 'clang')
 backup=('etc/bitcoin/pro-bitcoin.conf')
 source=("${pkgname}::git+https://github.com/pro-bitcoin/pro-bitcoin.git"
 	pro-bitcoin.conf
-        pro-bitcoind.service
+        pro-bitcoind@.service
         pro-bitcoin-sysusers.conf
         pro-bitcoin-core-01-systemd-sysusers.hook
 	pro-bitcoin-core-02-chown.hook)
 sha256sums=('SKIP'
-	    '413b478091bfb75c9221ae0a219618796be9f2ef06cec69252e473190074d85b'
-            '3612464934304423ad190802174992982b30c1c179cfea01d49389c0179fb77b'
+	    'SKIP'
+            'SKIP'
             'f126b4824e43d9760ab2021460a37d859986f07e1ac9245ee4938e832739f73a'
             '0ebed82d37ea78cbfc6fbbb3e5f38419efffded16d0e98b5d4d1bb0d75071f56'
             'c1341e6cf6c511c3f1f91a39c5cccabd72549f8e064902f5f35b1f6fe8dff128')
@@ -70,10 +70,10 @@ package() {
   install -dm 700 "$pkgdir/etc/bitcoin"
 
   msg2 'Installing bitcoin.conf...'
-  install -Dm 600 "$srcdir/pro-bitcoin.conf" -t "$pkgdir/etc/bitcoin"
+  install -Dm 650 "$srcdir/pro-bitcoin.conf" -t "$pkgdir/etc/bitcoin"
 
   msg2 'Installing bitcoind.service...'
-  install -Dm 644 "$srcdir/pro-bitcoind.service" -t "$pkgdir/usr/lib/systemd/system"
+  install -Dm 644 "$srcdir/pro-bitcoind@.service" -t "$pkgdir/usr/lib/systemd/system"
 
   msg2 'Installing bitcoin-sysusers.conf...'
   install -Dm 644 "$srcdir/pro-bitcoin-sysusers.conf" "$pkgdir/usr/lib/sysusers.d/pro-bitcoin.conf"
diff --git a/pro-bitcoind.service b/pro-bitcoind@.service
index 69bfa25a5b6f..91e86bf391c9 100644
--- a/pro-bitcoind.service
+++ b/pro-bitcoind@.service
@@ -1,22 +1,12 @@
-# It is not recommended to modify this file in-place, because it will
-# be overwritten during package upgrades. If you want to add further
-# options or overwrite existing ones then use
-# $ systemctl edit bitcoind.service
-# See "man systemd.service" for details.
-
-# Note that almost all daemon options could be specified in
-# /etc/bitcoin/bitcoin.conf, but keep in mind those explicitly
-# specified as arguments in ExecStart= will override those in the
-# config file.
-
 [Unit]
-Description=Prometheus Bitcoin daemon
+Description=Prometheus Bitcoin daemon on %I
 After=network.target
 
 [Service]
 ExecStart=/usr/bin/pro-bitcoind -daemon \
-                            -pid=/run/bitcoind/bitcoind.pid \
-                            -conf=/etc/bitcoin/pro-bitcoin.conf \
+                            -chain=%i
+                            -pid=/run/bitcoind-%i/bitcoind.pid \
+                            -conf=/etc/bitcoin/bitcoin.conf \
                             -datadir=/var/lib/bitcoind
 
 # Make sure the config directory is readable by the service user
@@ -27,7 +17,7 @@ ExecStartPre=/bin/chgrp bitcoin /etc/bitcoin
 ####################
 
 Type=forking
-PIDFile=/run/bitcoind/bitcoind.pid
+PIDFile=/run/bitcoind-%i/bitcoind.pid
 Restart=on-failure
 
 # Directory creation and permissions
@@ -38,7 +28,7 @@ User=bitcoin
 Group=bitcoin
 
 # /run/bitcoind
-RuntimeDirectory=bitcoind
+RuntimeDirectory=bitcoind-%i
 RuntimeDirectoryMode=0710
 
 # /etc/bitcoin