summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorquest2020-07-22 19:22:19 -0700
committerquest2020-07-22 19:22:19 -0700
commit4fff99e40ec5d84a4c14a74b8c49bdf6fd5f31bd (patch)
tree0f611e52e0bf2f7b1d59fa12f5c556e4aa430608
parent660a29561bffd95e9c7cca50bc0c7bc7ec9f7389 (diff)
downloadaur-4fff99e40ec5d84a4c14a74b8c49bdf6fd5f31bd.tar.gz
Fix bitcoin service start
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--bitcoin-reindex.service2
-rw-r--r--bitcoin.install7
-rw-r--r--bitcoin.service2
5 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 344e53aa12bb..af5bc88ecec0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bitcoin-abc
pkgdesc = Bitcoin ABC with bitcoind, bitcoin-tx, bitcoin-seeder and bitcoin-cli
pkgver = 0.21.11
- pkgrel = 2
+ pkgrel = 3
url = https://bitcoinabc.org
install = bitcoin.install
arch = i686
@@ -35,9 +35,9 @@ pkgbase = bitcoin-abc
sha256sums = ff0000d7109a3a827f9e5f5c6903a912a938be02eebcf0471953825932d7dd44
sha256sums = c30e5c7e0e97b001fdeac5f4510d5ebc0e0499ec086325e845db609a24f2e22f
sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f
- sha256sums = 9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880
- sha256sums = 35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679
- sha256sums = c8a667f7138a504f0a3018b48eb687814cfc741f4d38d8699b0b3b5234b25fea
+ sha256sums = f2fd9d8331238727333cf2412ba3759cb194a65b2060eff36808b24c06382104
+ sha256sums = 497dbeefb9cd9792757a9b6e1fbfd92710d19990ee2959add6c30533ae40b6f6
+ sha256sums = 16ea5b19d554e0cb748ba14cbeee6015ed456b66f981fb8769f1403720b2d0a9
pkgname = bitcoin-abc
diff --git a/PKGBUILD b/PKGBUILD
index dc5111294a05..4f9f98351c30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=bitcoin-abc
pkgver=0.21.11
-pkgrel=2
+pkgrel=3
pkgdesc="Bitcoin ABC with bitcoind, bitcoin-tx, bitcoin-seeder and bitcoin-cli"
arch=('i686' 'x86_64')
url="https://bitcoinabc.org"
@@ -18,9 +18,9 @@ source=(https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v$pkgver.tar.gz
sha256sums=('ff0000d7109a3a827f9e5f5c6903a912a938be02eebcf0471953825932d7dd44'
'c30e5c7e0e97b001fdeac5f4510d5ebc0e0499ec086325e845db609a24f2e22f'
'8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f'
- '9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880'
- '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679'
- 'c8a667f7138a504f0a3018b48eb687814cfc741f4d38d8699b0b3b5234b25fea')
+ 'f2fd9d8331238727333cf2412ba3759cb194a65b2060eff36808b24c06382104'
+ '497dbeefb9cd9792757a9b6e1fbfd92710d19990ee2959add6c30533ae40b6f6'
+ '16ea5b19d554e0cb748ba14cbeee6015ed456b66f981fb8769f1403720b2d0a9')
backup=('etc/bitcoin/bitcoin.conf'
'etc/logrotate.d/bitcoin')
provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-seeder')
@@ -76,6 +76,7 @@ package() {
msg2 'Installing essential directories'
install -dm 700 "$pkgdir/etc/bitcoin"
install -dm 755 "$pkgdir/srv/bitcoin"
+ install -dm 755 "$pkgdir/run/bitcoin"
pushd build
msg2 'Installing executables and man pages...'
diff --git a/bitcoin-reindex.service b/bitcoin-reindex.service
index 236a24d05e54..52900d8fc4c5 100644
--- a/bitcoin-reindex.service
+++ b/bitcoin-reindex.service
@@ -10,7 +10,7 @@ ExecStart=/usr/bin/bitcoind -daemon=0 \
-conf=/etc/bitcoin/bitcoin.conf \
-datadir=/srv/bitcoin \
-reindex \
- -pid=/run/bitcoind.pid
+ -pid=/run/bitcoin/bitcoind.pid
ExecReload=/usr/bin/kill -HUP $MAINPID
ExecStop=/usr/bin/bitcoind stop
PrivateTmp=true
diff --git a/bitcoin.install b/bitcoin.install
index e8a2fa7b4abd..6c28074dfbb9 100644
--- a/bitcoin.install
+++ b/bitcoin.install
@@ -3,19 +3,19 @@ _bc_group=bitcoin
post_install() {
_mkuser
- chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin
+ chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin /run/bitcoin
printf "%b\n" "$bitcoin"
}
post_upgrade() {
_mkuser
- chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin
+ chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin /run/bitcoin
printf "%b\n" "$bitcoin"
}
post_remove() {
_rmuser
- rm -rf /srv/bitcoin
+ rm -rf /srv/bitcoin /run/bitcoin
}
_mkuser() {
@@ -45,7 +45,6 @@ To communicate with bitcoin-abc as a normal user:
$ mkdir -p ~/.bitcoin
$ cat > ~/.bitcoin/bitcoin.conf <<'EOF'
-rpcconnect=127.0.0.1
rpcport=8332
rpcuser=bitcoin
rpcpassword=secret
diff --git a/bitcoin.service b/bitcoin.service
index abb6da86942d..7f2c2ac52785 100644
--- a/bitcoin.service
+++ b/bitcoin.service
@@ -9,7 +9,7 @@ Group=bitcoin
ExecStart=/usr/bin/bitcoind -daemon=0 \
-conf=/etc/bitcoin/bitcoin.conf \
-datadir=/srv/bitcoin \
- -pid=/run/bitcoind.pid
+ -pid=/run/bitcoin/bitcoind.pid
ExecReload=/usr/bin/kill -HUP $MAINPID
ExecStop=/usr/bin/bitcoind stop
PrivateTmp=true