From 247faf23a10ec149e1952ef9b73df5981ec838aa Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Thu, 7 Jun 2018 00:29:12 +0200 Subject: [PATCH] Rename bcash packages to match coin naming convention --- README.md | 34 +++++++++---------- .../debian/blockbook-bcash-testnet.conffiles | 1 + .../debian/blockbook-bcash-testnet.cron.daily | 2 ++ build/deb/debian/blockbook-bcash-testnet.dirs | 2 ++ .../debian/blockbook-bcash-testnet.install | 6 ++++ .../deb/debian/blockbook-bcash-testnet.links | 2 ++ .../debian/blockbook-bcash-testnet.postinst | 23 +++++++++++++ ...ervice => blockbook-bcash-testnet.service} | 10 +++--- build/deb/debian/blockbook-bcash.conffiles | 1 + build/deb/debian/blockbook-bcash.cron.daily | 2 ++ build/deb/debian/blockbook-bcash.dirs | 2 ++ build/deb/debian/blockbook-bcash.install | 6 ++++ build/deb/debian/blockbook-bcash.links | 2 ++ build/deb/debian/blockbook-bcash.postinst | 23 +++++++++++++ ...ok-bch.service => blockbook-bcash.service} | 12 +++---- .../debian/blockbook-bch-testnet.conffiles | 1 - .../debian/blockbook-bch-testnet.cron.daily | 2 -- build/deb/debian/blockbook-bch-testnet.dirs | 2 -- .../deb/debian/blockbook-bch-testnet.install | 6 ---- build/deb/debian/blockbook-bch-testnet.links | 2 -- .../deb/debian/blockbook-bch-testnet.postinst | 23 ------------- build/deb/debian/blockbook-bch.conffiles | 1 - build/deb/debian/blockbook-bch.cron.daily | 2 -- build/deb/debian/blockbook-bch.dirs | 2 -- build/deb/debian/blockbook-bch.install | 6 ---- build/deb/debian/blockbook-bch.links | 2 -- build/deb/debian/blockbook-bch.postinst | 23 ------------- build/deb/debian/control | 6 ++-- configs/{bch.json => bcash.json} | 3 +- .../{bch-testnet.json => bcash_testnet.json} | 3 +- .../backends/bcash/{bch.conf => bcash.conf} | 0 .../{bch-testnet.conf => bcash_testnet.conf} | 0 .../backends/bcash/debian/bcash-bch.conffiles | 1 - contrib/backends/bcash/debian/bcash-bch.dirs | 1 - .../backends/bcash/debian/bcash-bch.install | 2 -- .../bcash/debian/bcash-testnet.conffiles | 2 +- .../backends/bcash/debian/bcash-testnet.dirs | 2 +- .../bcash/debian/bcash-testnet.install | 4 +-- .../bcash/debian/bcash-testnet.logrotate | 4 +-- .../bcash/debian/bcash-testnet.postinst | 4 +-- .../bcash/debian/bcash-testnet.service | 6 ++-- contrib/backends/bcash/debian/bcash.conffiles | 1 + contrib/backends/bcash/debian/bcash.dirs | 1 + contrib/backends/bcash/debian/bcash.install | 2 ++ .../{bcash-bch.logrotate => bcash.logrotate} | 4 +-- .../{bcash-bch.postinst => bcash.postinst} | 4 +-- .../{bcash-bch.service => bcash.service} | 8 ++--- contrib/backends/bcash/debian/changelog | 6 ++++ contrib/backends/bcash/debian/control | 2 +- 49 files changed, 137 insertions(+), 129 deletions(-) create mode 100644 build/deb/debian/blockbook-bcash-testnet.conffiles create mode 100644 build/deb/debian/blockbook-bcash-testnet.cron.daily create mode 100644 build/deb/debian/blockbook-bcash-testnet.dirs create mode 100755 build/deb/debian/blockbook-bcash-testnet.install create mode 100644 build/deb/debian/blockbook-bcash-testnet.links create mode 100644 build/deb/debian/blockbook-bcash-testnet.postinst rename build/deb/debian/{blockbook-bch-testnet.service => blockbook-bcash-testnet.service} (62%) create mode 100644 build/deb/debian/blockbook-bcash.conffiles create mode 100644 build/deb/debian/blockbook-bcash.cron.daily create mode 100644 build/deb/debian/blockbook-bcash.dirs create mode 100755 build/deb/debian/blockbook-bcash.install create mode 100644 build/deb/debian/blockbook-bcash.links create mode 100644 build/deb/debian/blockbook-bcash.postinst rename build/deb/debian/{blockbook-bch.service => blockbook-bcash.service} (63%) delete mode 100644 build/deb/debian/blockbook-bch-testnet.conffiles delete mode 100644 build/deb/debian/blockbook-bch-testnet.cron.daily delete mode 100644 build/deb/debian/blockbook-bch-testnet.dirs delete mode 100755 build/deb/debian/blockbook-bch-testnet.install delete mode 100644 build/deb/debian/blockbook-bch-testnet.links delete mode 100644 build/deb/debian/blockbook-bch-testnet.postinst delete mode 100644 build/deb/debian/blockbook-bch.conffiles delete mode 100644 build/deb/debian/blockbook-bch.cron.daily delete mode 100644 build/deb/debian/blockbook-bch.dirs delete mode 100755 build/deb/debian/blockbook-bch.install delete mode 100644 build/deb/debian/blockbook-bch.links delete mode 100644 build/deb/debian/blockbook-bch.postinst rename configs/{bch.json => bcash.json} (92%) rename configs/{bch-testnet.json => bcash_testnet.json} (90%) rename contrib/backends/bcash/{bch.conf => bcash.conf} (100%) rename contrib/backends/bcash/{bch-testnet.conf => bcash_testnet.conf} (100%) delete mode 100644 contrib/backends/bcash/debian/bcash-bch.conffiles delete mode 100644 contrib/backends/bcash/debian/bcash-bch.dirs delete mode 100644 contrib/backends/bcash/debian/bcash-bch.install create mode 100644 contrib/backends/bcash/debian/bcash.conffiles create mode 100644 contrib/backends/bcash/debian/bcash.dirs create mode 100644 contrib/backends/bcash/debian/bcash.install rename contrib/backends/bcash/debian/{bcash-bch.logrotate => bcash.logrotate} (58%) rename contrib/backends/bcash/debian/{bcash-bch.postinst => bcash.postinst} (59%) rename contrib/backends/bcash/debian/{bcash-bch.service => bcash.service} (79%) diff --git a/README.md b/README.md index bce3e1a8..0a39d0da 100644 --- a/README.md +++ b/README.md @@ -76,8 +76,8 @@ Blockbook logs only to stderr, logging to files is disabled. Verbosity of logs c - [Bitcoin](bchain/coins/btc/btc.md) - [Bitcoin Testnet](bchain/coins/btc/btctestnet.md) -- BCH -- BCH Testnet +- Bcash +- Bcash Testnet - [ZCash](bchain/coins/zec/zec.md) - ZCash Testnet - [Ethereum](bchain/coins/eth/eth.md) @@ -129,21 +129,21 @@ The data are separated to different column families: ## Registry of ports -| coin | blockbook http port | blockbook socket.io port | RPC port | zmq port | -|-------------|---------------------|--------------------------|----------|----------| -| btc | 9030 | 9130 | 8030 | 38330 | -| bch | 9031 | 9131 | 8031 | 38331 | -| zec | 9032 | 9132 | 8032 | 38332 | -| dash | 9033 | 9133 | 8033 | 38333 | -| ltc | 9034 | 9134 | 8034 | 38334 | -| btg | 9035 | 9135 | 8035 | 38335 | -| eth | 9036 | 9136 | 8036 | 38336* | -| etc | 9037 | 9137 | 8037 | | -| xem | 9038 | 9138 | 8038 | 38336 | -| btc-testnet | 19030 | 19130 | 18030 | 48330 | -| bch-testnet | 19031 | 19131 | 18031 | 48331 | -| zec-testnet | 19032 | 19132 | 18032 | 48332 | -| eth-ropsten | 19036 | 19136 | 18036 | 48333* | +| coin | blockbook http port | blockbook socket.io port | RPC port | zmq port | +|--------------------------|---------------------|--------------------------|----------|----------| +| Bitcoin | 9030 | 9130 | 8030 | 38330 | +| Bcash | 9031 | 9131 | 8031 | 38331 | +| Zcash | 9032 | 9132 | 8032 | 38332 | +| dash | 9033 | 9133 | 8033 | 38333 | +| ltc | 9034 | 9134 | 8034 | 38334 | +| btg | 9035 | 9135 | 8035 | 38335 | +| Ethereum | 9036 | 9136 | 8036 | 38336* | +| etc | 9037 | 9137 | 8037 | | +| xem | 9038 | 9138 | 8038 | 38336 | +| Bitcoin Testnet | 19030 | 19130 | 18030 | 48330 | +| Bcash Testnet | 19031 | 19131 | 18031 | 48331 | +| Zcash Testnet | 19032 | 19132 | 18032 | 48332 | +| Ethereum Testnet Ropsten | 19036 | 19136 | 18036 | 48333* | \* geth listens on this port, however not as zmq service ## Todo diff --git a/build/deb/debian/blockbook-bcash-testnet.conffiles b/build/deb/debian/blockbook-bcash-testnet.conffiles new file mode 100644 index 00000000..47da7625 --- /dev/null +++ b/build/deb/debian/blockbook-bcash-testnet.conffiles @@ -0,0 +1 @@ +/opt/coins/blockbook/bcash_testnet/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-bcash-testnet.cron.daily b/build/deb/debian/blockbook-bcash-testnet.cron.daily new file mode 100644 index 00000000..ffc5baf8 --- /dev/null +++ b/build/deb/debian/blockbook-bcash-testnet.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/coins/blockbook/bcash_testnet/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-bcash-testnet.dirs b/build/deb/debian/blockbook-bcash-testnet.dirs new file mode 100644 index 00000000..194e9726 --- /dev/null +++ b/build/deb/debian/blockbook-bcash-testnet.dirs @@ -0,0 +1,2 @@ +/opt/coins/data/bcash_testnet/blockbook +/opt/coins/blockbook/bcash_testnet/logs diff --git a/build/deb/debian/blockbook-bcash-testnet.install b/build/deb/debian/blockbook-bcash-testnet.install new file mode 100755 index 00000000..e212e59a --- /dev/null +++ b/build/deb/debian/blockbook-bcash-testnet.install @@ -0,0 +1,6 @@ +#!/usr/bin/dh-exec +blockbook /opt/coins/blockbook/bcash_testnet/bin +cert /opt/coins/blockbook/bcash_testnet +static /opt/coins/blockbook/bcash_testnet +configs/bcash_testnet.json => /opt/coins/blockbook/bcash_testnet/config/blockchaincfg.json +logrotate.sh /opt/coins/blockbook/bcash_testnet/bin diff --git a/build/deb/debian/blockbook-bcash-testnet.links b/build/deb/debian/blockbook-bcash-testnet.links new file mode 100644 index 00000000..99a18b69 --- /dev/null +++ b/build/deb/debian/blockbook-bcash-testnet.links @@ -0,0 +1,2 @@ +/opt/coins/blockbook/bcash_testnet/cert/testcert.crt /opt/coins/blockbook/bcash_testnet/cert/blockbook.crt +/opt/coins/blockbook/bcash_testnet/cert/testcert.key /opt/coins/blockbook/bcash_testnet/cert/blockbook.key diff --git a/build/deb/debian/blockbook-bcash-testnet.postinst b/build/deb/debian/blockbook-bcash-testnet.postinst new file mode 100644 index 00000000..58ef2f9f --- /dev/null +++ b/build/deb/debian/blockbook-bcash-testnet.postinst @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +case "$1" in + + configure) + if ! id -u blockbook-bcash &> /dev/null + then + useradd --system -M -U blockbook-bcash -s /bin/false + fi + + for dir in /opt/coins/data/bcash_testnet/blockbook /opt/coins/blockbook/bcash_testnet/logs + do + if [ "$(stat -c '%U' $dir)" != "blockbook-bcash" ] + then + chown -R blockbook-bcash:blockbook-bcash $dir + fi + done + ;; + +esac + +#DEBHELPER# diff --git a/build/deb/debian/blockbook-bch-testnet.service b/build/deb/debian/blockbook-bcash-testnet.service similarity index 62% rename from build/deb/debian/blockbook-bch-testnet.service rename to build/deb/debian/blockbook-bcash-testnet.service index 35257826..a157b446 100644 --- a/build/deb/debian/blockbook-bch-testnet.service +++ b/build/deb/debian/blockbook-bcash-testnet.service @@ -1,20 +1,20 @@ # 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 blockbook-bch-testnet.service +# $ systemctl edit blockbook-bcash-testnet.service # See "man systemd.service" for details. [Unit] -Description=Blockbook daemon (BCH testnet) +Description=Blockbook daemon (Bcash testnet) After=network.target Wants=bcash-testnet.service [Service] -ExecStart=/opt/coins/blockbook/bch-testnet/bin/blockbook -coin=bch-testnet -blockchaincfg=/opt/coins/blockbook/bch-testnet/config/blockchaincfg.json -datadir=/opt/coins/data/bch-testnet/blockbook/db -sync -httpserver=:19031 -socketio=:19131 -certfile=/opt/coins/blockbook/bch-testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch-testnet/logs -User=blockbook-bch +ExecStart=/opt/coins/blockbook/bcash_testnet/bin/blockbook -blockchaincfg=/opt/coins/blockbook/bcash_testnet/config/blockchaincfg.json -datadir=/opt/coins/data/bcash_testnet/blockbook/db -sync -httpserver=:19031 -socketio=:19131 -certfile=/opt/coins/blockbook/bcash_testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bcash_testnet/logs +User=blockbook-bcash Type=simple Restart=on-failure -WorkingDirectory=/opt/coins/blockbook/bch-testnet +WorkingDirectory=/opt/coins/blockbook/bcash_testnet # Resource limits LimitNOFILE=500000 diff --git a/build/deb/debian/blockbook-bcash.conffiles b/build/deb/debian/blockbook-bcash.conffiles new file mode 100644 index 00000000..684c0294 --- /dev/null +++ b/build/deb/debian/blockbook-bcash.conffiles @@ -0,0 +1 @@ +/opt/coins/blockbook/bcash/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-bcash.cron.daily b/build/deb/debian/blockbook-bcash.cron.daily new file mode 100644 index 00000000..4a66059f --- /dev/null +++ b/build/deb/debian/blockbook-bcash.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/coins/blockbook/bcash/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-bcash.dirs b/build/deb/debian/blockbook-bcash.dirs new file mode 100644 index 00000000..5cf39a34 --- /dev/null +++ b/build/deb/debian/blockbook-bcash.dirs @@ -0,0 +1,2 @@ +/opt/coins/data/bcash/blockbook +/opt/coins/blockbook/bcash/logs diff --git a/build/deb/debian/blockbook-bcash.install b/build/deb/debian/blockbook-bcash.install new file mode 100755 index 00000000..ccd90741 --- /dev/null +++ b/build/deb/debian/blockbook-bcash.install @@ -0,0 +1,6 @@ +#!/usr/bin/dh-exec +blockbook /opt/coins/blockbook/bcash/bin +cert /opt/coins/blockbook/bcash +static /opt/coins/blockbook/bcash +configs/bcash.json => /opt/coins/blockbook/bcash/config/blockchaincfg.json +logrotate.sh /opt/coins/blockbook/bcash/bin diff --git a/build/deb/debian/blockbook-bcash.links b/build/deb/debian/blockbook-bcash.links new file mode 100644 index 00000000..3d1bc911 --- /dev/null +++ b/build/deb/debian/blockbook-bcash.links @@ -0,0 +1,2 @@ +/opt/coins/blockbook/bcash/cert/testcert.crt /opt/coins/blockbook/bcash/cert/blockbook.crt +/opt/coins/blockbook/bcash/cert/testcert.key /opt/coins/blockbook/bcash/cert/blockbook.key diff --git a/build/deb/debian/blockbook-bcash.postinst b/build/deb/debian/blockbook-bcash.postinst new file mode 100644 index 00000000..52f36399 --- /dev/null +++ b/build/deb/debian/blockbook-bcash.postinst @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +case "$1" in + + configure) + if ! id -u blockbook-bcash &> /dev/null + then + useradd --system -M -U blockbook-bcash -s /bin/false + fi + + for dir in /opt/coins/data/bcash/blockbook /opt/coins/blockbook/bcash/logs + do + if [ "$(stat -c '%U' $dir)" != "blockbook-bcash" ] + then + chown -R blockbook-bcash:blockbook-bcash $dir + fi + done + ;; + +esac + +#DEBHELPER# diff --git a/build/deb/debian/blockbook-bch.service b/build/deb/debian/blockbook-bcash.service similarity index 63% rename from build/deb/debian/blockbook-bch.service rename to build/deb/debian/blockbook-bcash.service index 3789317c..49d75ac7 100644 --- a/build/deb/debian/blockbook-bch.service +++ b/build/deb/debian/blockbook-bcash.service @@ -1,20 +1,20 @@ # 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 blockbook-bch.service +# $ systemctl edit blockbook-bcash.service # See "man systemd.service" for details. [Unit] -Description=Blockbook daemon (BCH mainnet) +Description=Blockbook daemon (Bcash mainnet) After=network.target -Wants=bcash-bch.service +Wants=bcash.service [Service] -ExecStart=/opt/coins/blockbook/bch/bin/blockbook -coin=bch -blockchaincfg=/opt/coins/blockbook/bch/config/blockchaincfg.json -datadir=/opt/coins/data/bch/blockbook/db -sync -httpserver=:9031 -socketio=:9131 -certfile=/opt/coins/blockbook/bch/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch/logs -User=blockbook-bch +ExecStart=/opt/coins/blockbook/bcash/bin/blockbook -blockchaincfg=/opt/coins/blockbook/bcash/config/blockchaincfg.json -datadir=/opt/coins/data/bcash/blockbook/db -sync -httpserver=:9031 -socketio=:9131 -certfile=/opt/coins/blockbook/bcash/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bcash/logs +User=blockbook-bcash Type=simple Restart=on-failure -WorkingDirectory=/opt/coins/blockbook/bch +WorkingDirectory=/opt/coins/blockbook/bcash # Resource limits LimitNOFILE=500000 diff --git a/build/deb/debian/blockbook-bch-testnet.conffiles b/build/deb/debian/blockbook-bch-testnet.conffiles deleted file mode 100644 index aaccca4e..00000000 --- a/build/deb/debian/blockbook-bch-testnet.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/blockbook/bch-testnet/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-bch-testnet.cron.daily b/build/deb/debian/blockbook-bch-testnet.cron.daily deleted file mode 100644 index a790c4b6..00000000 --- a/build/deb/debian/blockbook-bch-testnet.cron.daily +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/coins/blockbook/bch-testnet/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-bch-testnet.dirs b/build/deb/debian/blockbook-bch-testnet.dirs deleted file mode 100644 index a6f4d16e..00000000 --- a/build/deb/debian/blockbook-bch-testnet.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/data/bch-testnet/blockbook -/opt/coins/blockbook/bch-testnet/logs diff --git a/build/deb/debian/blockbook-bch-testnet.install b/build/deb/debian/blockbook-bch-testnet.install deleted file mode 100755 index d1e6864a..00000000 --- a/build/deb/debian/blockbook-bch-testnet.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -blockbook /opt/coins/blockbook/bch-testnet/bin -cert /opt/coins/blockbook/bch-testnet -static /opt/coins/blockbook/bch-testnet -configs/bch-testnet.json => /opt/coins/blockbook/bch-testnet/config/blockchaincfg.json -logrotate.sh /opt/coins/blockbook/bch-testnet/bin diff --git a/build/deb/debian/blockbook-bch-testnet.links b/build/deb/debian/blockbook-bch-testnet.links deleted file mode 100644 index 8e1d05f6..00000000 --- a/build/deb/debian/blockbook-bch-testnet.links +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/blockbook/bch-testnet/cert/testcert.crt /opt/coins/blockbook/bch-testnet/cert/blockbook.crt -/opt/coins/blockbook/bch-testnet/cert/testcert.key /opt/coins/blockbook/bch-testnet/cert/blockbook.key diff --git a/build/deb/debian/blockbook-bch-testnet.postinst b/build/deb/debian/blockbook-bch-testnet.postinst deleted file mode 100644 index daa1910e..00000000 --- a/build/deb/debian/blockbook-bch-testnet.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -case "$1" in - - configure) - if ! id -u blockbook-bch &> /dev/null - then - useradd --system -M -U blockbook-bch -s /bin/false - fi - - for dir in /opt/coins/data/bch-testnet/blockbook /opt/coins/blockbook/bch-testnet/logs - do - if [ "$(stat -c '%U' $dir)" != "blockbook-bch" ] - then - chown -R blockbook-bch:blockbook-bch $dir - fi - done - ;; - -esac - -#DEBHELPER# diff --git a/build/deb/debian/blockbook-bch.conffiles b/build/deb/debian/blockbook-bch.conffiles deleted file mode 100644 index 2f6fffc1..00000000 --- a/build/deb/debian/blockbook-bch.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/blockbook/bch/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-bch.cron.daily b/build/deb/debian/blockbook-bch.cron.daily deleted file mode 100644 index 910e4c12..00000000 --- a/build/deb/debian/blockbook-bch.cron.daily +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/coins/blockbook/bch/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-bch.dirs b/build/deb/debian/blockbook-bch.dirs deleted file mode 100644 index 34b594ad..00000000 --- a/build/deb/debian/blockbook-bch.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/data/bch/blockbook -/opt/coins/blockbook/bch/logs diff --git a/build/deb/debian/blockbook-bch.install b/build/deb/debian/blockbook-bch.install deleted file mode 100755 index 60b20232..00000000 --- a/build/deb/debian/blockbook-bch.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -blockbook /opt/coins/blockbook/bch/bin -cert /opt/coins/blockbook/bch -static /opt/coins/blockbook/bch -configs/bch.json => /opt/coins/blockbook/bch/config/blockchaincfg.json -logrotate.sh /opt/coins/blockbook/bch/bin diff --git a/build/deb/debian/blockbook-bch.links b/build/deb/debian/blockbook-bch.links deleted file mode 100644 index b08a157d..00000000 --- a/build/deb/debian/blockbook-bch.links +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/blockbook/bch/cert/testcert.crt /opt/coins/blockbook/bch/cert/blockbook.crt -/opt/coins/blockbook/bch/cert/testcert.key /opt/coins/blockbook/bch/cert/blockbook.key diff --git a/build/deb/debian/blockbook-bch.postinst b/build/deb/debian/blockbook-bch.postinst deleted file mode 100644 index ebc552d1..00000000 --- a/build/deb/debian/blockbook-bch.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -case "$1" in - - configure) - if ! id -u blockbook-bch &> /dev/null - then - useradd --system -M -U blockbook-bch -s /bin/false - fi - - for dir in /opt/coins/data/bch/blockbook /opt/coins/blockbook/bch/logs - do - if [ "$(stat -c '%U' $dir)" != "blockbook-bch" ] - then - chown -R blockbook-bch:blockbook-bch $dir - fi - done - ;; - -esac - -#DEBHELPER# diff --git a/build/deb/debian/control b/build/deb/debian/control index 93c828bf..3acfb8fa 100644 --- a/build/deb/debian/control +++ b/build/deb/debian/control @@ -30,12 +30,12 @@ Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, zcash-testnet Description: Satoshilabs blockbook server (ZCash testnet) -Package: blockbook-bch +Package: blockbook-bcash Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bcash-bch +Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bcash Description: Satoshilabs blockbook server (Bitcoin Cash mainnet) -Package: blockbook-bch-testnet +Package: blockbook-bcash-testnet Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bcash-testnet Description: Satoshilabs blockbook server (Bitcoin Cash testnet) diff --git a/configs/bch.json b/configs/bcash.json similarity index 92% rename from configs/bch.json rename to configs/bcash.json index a0450eef..7782bb76 100644 --- a/configs/bch.json +++ b/configs/bcash.json @@ -1,4 +1,5 @@ { + "coin_name": "Bcash", "rpcURL": "http://127.0.0.1:8031", "rpcUser": "rpc", "rpcPass": "rpc", @@ -10,4 +11,4 @@ "mempoolSubWorkers": 2, "blockAddressesToKeep": 300, "addressFormat": "legacy" -} +} \ No newline at end of file diff --git a/configs/bch-testnet.json b/configs/bcash_testnet.json similarity index 90% rename from configs/bch-testnet.json rename to configs/bcash_testnet.json index d79c870e..ebe41a9d 100644 --- a/configs/bch-testnet.json +++ b/configs/bcash_testnet.json @@ -1,4 +1,5 @@ { + "coin_name": "Bcash Testnet", "rpcURL": "http://localhost:18031", "rpcUser": "rpc", "rpcPass": "rpc", @@ -10,4 +11,4 @@ "mempoolSubWorkers": 2, "blockAddressesToKeep": 300, "addressFormat": "legacy" -} +} \ No newline at end of file diff --git a/contrib/backends/bcash/bch.conf b/contrib/backends/bcash/bcash.conf similarity index 100% rename from contrib/backends/bcash/bch.conf rename to contrib/backends/bcash/bcash.conf diff --git a/contrib/backends/bcash/bch-testnet.conf b/contrib/backends/bcash/bcash_testnet.conf similarity index 100% rename from contrib/backends/bcash/bch-testnet.conf rename to contrib/backends/bcash/bcash_testnet.conf diff --git a/contrib/backends/bcash/debian/bcash-bch.conffiles b/contrib/backends/bcash/debian/bcash-bch.conffiles deleted file mode 100644 index 39ff192f..00000000 --- a/contrib/backends/bcash/debian/bcash-bch.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/nodes/bitcoin-abc/bch/bch.conf diff --git a/contrib/backends/bcash/debian/bcash-bch.dirs b/contrib/backends/bcash/debian/bcash-bch.dirs deleted file mode 100644 index b5baf026..00000000 --- a/contrib/backends/bcash/debian/bcash-bch.dirs +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/data/bch/bitcoin diff --git a/contrib/backends/bcash/debian/bcash-bch.install b/contrib/backends/bcash/debian/bcash-bch.install deleted file mode 100644 index 89f8005f..00000000 --- a/contrib/backends/bcash/debian/bcash-bch.install +++ /dev/null @@ -1,2 +0,0 @@ -bitcoin-abc/* /opt/coins/nodes/bitcoin-abc/bch -bch.conf /opt/coins/nodes/bitcoin-abc/bch diff --git a/contrib/backends/bcash/debian/bcash-testnet.conffiles b/contrib/backends/bcash/debian/bcash-testnet.conffiles index 24b971a5..652afa0e 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.conffiles +++ b/contrib/backends/bcash/debian/bcash-testnet.conffiles @@ -1 +1 @@ -/opt/coins/nodes/bitcoin-abc/bch-testnet/bch-testnet.conf +/opt/coins/nodes/bcash_testnet/bcash_testnet.conf diff --git a/contrib/backends/bcash/debian/bcash-testnet.dirs b/contrib/backends/bcash/debian/bcash-testnet.dirs index d5a2c725..139a2185 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.dirs +++ b/contrib/backends/bcash/debian/bcash-testnet.dirs @@ -1 +1 @@ -/opt/coins/data/bch-testnet/bitcoin +/opt/coins/data/bcash_testnet/backend diff --git a/contrib/backends/bcash/debian/bcash-testnet.install b/contrib/backends/bcash/debian/bcash-testnet.install index 926a42fd..cc51d313 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.install +++ b/contrib/backends/bcash/debian/bcash-testnet.install @@ -1,2 +1,2 @@ -bitcoin-abc/* /opt/coins/nodes/bitcoin-abc/bch-testnet -bch-testnet.conf /opt/coins/nodes/bitcoin-abc/bch-testnet +bitcoin-abc/* /opt/coins/nodes/bcash_testnet +bcash_testnet.conf /opt/coins/nodes/bcash_testnet diff --git a/contrib/backends/bcash/debian/bcash-testnet.logrotate b/contrib/backends/bcash/debian/bcash-testnet.logrotate index 766fbf06..8230770b 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.logrotate +++ b/contrib/backends/bcash/debian/bcash-testnet.logrotate @@ -1,5 +1,5 @@ -/opt/coins/data/bch-testnet/bitcoin/testnet3/debug.log -/opt/coins/data/bch-testnet/bitcoin/testnet3/db.log +/opt/coins/data/bcash_testnet/backend/testnet3/debug.log +/opt/coins/data/bcash_testnet/backend/testnet3/db.log { rotate 7 daily diff --git a/contrib/backends/bcash/debian/bcash-testnet.postinst b/contrib/backends/bcash/debian/bcash-testnet.postinst index 6cf4fdff..92c684a5 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.postinst +++ b/contrib/backends/bcash/debian/bcash-testnet.postinst @@ -9,9 +9,9 @@ case "$1" in useradd --system -M -U bcash -s /bin/false fi - if [ "$(stat -c '%U' /opt/coins/data/bch-testnet/bitcoin)" != "bcash" ] + if [ "$(stat -c '%U' /opt/coins/data/bcash_testnet/backend)" != "bcash" ] then - chown -R bcash:bcash /opt/coins/data/bch-testnet/bitcoin + chown -R bcash:bcash /opt/coins/data/bcash_testnet/backend fi ;; diff --git a/contrib/backends/bcash/debian/bcash-testnet.service b/contrib/backends/bcash/debian/bcash-testnet.service index 50c4496b..8dbb97e1 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.service +++ b/contrib/backends/bcash/debian/bcash-testnet.service @@ -5,19 +5,19 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/coins/nodes/bitcoin-abc/bch-testnet/bch-testnet.conf +# /opt/coins/nodes/bcash_testnet/bcash_testnet.conf [Unit] Description=Bitcoin Cash daemon (testnet) After=network.target [Service] -ExecStart=/opt/coins/nodes/bitcoin-abc/bch-testnet/bin/bitcoind -datadir=/opt/coins/data/bch-testnet/bitcoin -conf=/opt/coins/nodes/bitcoin-abc/bch-testnet/bch-testnet.conf -pid=/run/bitcoin-abc/bch-testnet.pid +ExecStart=/opt/coins/nodes/bcash_testnet/bin/bitcoind -datadir=/opt/coins/data/bcash_testnet/backend -conf=/opt/coins/nodes/bcash_testnet/bcash_testnet.conf -pid=/run/bitcoin-abc/bcash_testnet.pid # Creates /run/bitcoin-abc owned by bcash RuntimeDirectory=bitcoin-abc User=bcash Type=forking -PIDFile=/run/bitcoin-abc/bch-testnet.pid +PIDFile=/run/bitcoin-abc/bcash_testnet.pid Restart=on-failure # Resource limits diff --git a/contrib/backends/bcash/debian/bcash.conffiles b/contrib/backends/bcash/debian/bcash.conffiles new file mode 100644 index 00000000..97e7009b --- /dev/null +++ b/contrib/backends/bcash/debian/bcash.conffiles @@ -0,0 +1 @@ +/opt/coins/nodes/bcash/bcash.conf diff --git a/contrib/backends/bcash/debian/bcash.dirs b/contrib/backends/bcash/debian/bcash.dirs new file mode 100644 index 00000000..6cb9dcd5 --- /dev/null +++ b/contrib/backends/bcash/debian/bcash.dirs @@ -0,0 +1 @@ +/opt/coins/data/bcash/backend diff --git a/contrib/backends/bcash/debian/bcash.install b/contrib/backends/bcash/debian/bcash.install new file mode 100644 index 00000000..6d91821e --- /dev/null +++ b/contrib/backends/bcash/debian/bcash.install @@ -0,0 +1,2 @@ +bitcoin-abc/* /opt/coins/nodes/bcash +bcash.conf /opt/coins/nodes/bcash diff --git a/contrib/backends/bcash/debian/bcash-bch.logrotate b/contrib/backends/bcash/debian/bcash.logrotate similarity index 58% rename from contrib/backends/bcash/debian/bcash-bch.logrotate rename to contrib/backends/bcash/debian/bcash.logrotate index 9b267719..03d8ec9e 100644 --- a/contrib/backends/bcash/debian/bcash-bch.logrotate +++ b/contrib/backends/bcash/debian/bcash.logrotate @@ -1,5 +1,5 @@ -/opt/coins/data/bch/bitcoin/debug.log -/opt/coins/data/bch/bitcoin/db.log +/opt/coins/data/bcash/backend/debug.log +/opt/coins/data/bcash/backend/db.log { rotate 7 daily diff --git a/contrib/backends/bcash/debian/bcash-bch.postinst b/contrib/backends/bcash/debian/bcash.postinst similarity index 59% rename from contrib/backends/bcash/debian/bcash-bch.postinst rename to contrib/backends/bcash/debian/bcash.postinst index 5c0a6b46..a0fc618c 100644 --- a/contrib/backends/bcash/debian/bcash-bch.postinst +++ b/contrib/backends/bcash/debian/bcash.postinst @@ -9,9 +9,9 @@ case "$1" in useradd --system -M -U bcash -s /bin/false fi - if [ "$(stat -c '%U' /opt/coins/data/bch/bitcoin)" != "bcash" ] + if [ "$(stat -c '%U' /opt/coins/data/bcash/backend)" != "bcash" ] then - chown -R bcash:bcash /opt/coins/data/bch/bitcoin + chown -R bcash:bcash /opt/coins/data/bcash/backend fi ;; diff --git a/contrib/backends/bcash/debian/bcash-bch.service b/contrib/backends/bcash/debian/bcash.service similarity index 79% rename from contrib/backends/bcash/debian/bcash-bch.service rename to contrib/backends/bcash/debian/bcash.service index a4aa3770..f0969e11 100644 --- a/contrib/backends/bcash/debian/bcash-bch.service +++ b/contrib/backends/bcash/debian/bcash.service @@ -1,23 +1,23 @@ # 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 bcash-bch.service +# $ systemctl edit bcash.service # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/coins/nodes/bitcoin-abc/bch/bch.conf +# /opt/coins/nodes/bcash/bcash.conf [Unit] Description=Bitcoin Cash daemon (mainnet) After=network.target [Service] -ExecStart=/opt/coins/nodes/bitcoin-abc/bch/bin/bitcoind -datadir=/opt/coins/data/bch/bitcoin -conf=/opt/coins/nodes/bitcoin-abc/bch/bch.conf -pid=/run/bitcoin-abc/bch.pid +ExecStart=/opt/coins/nodes/bcash/bin/bitcoind -datadir=/opt/coins/data/bcash/backend -conf=/opt/coins/nodes/bcash/bcash.conf -pid=/run/bitcoin-abc/bcash.pid # Creates /run/bitcoin-abc owned by bcash RuntimeDirectory=bitcoin-abc User=bcash Type=forking -PIDFile=/run/bitcoin-abc/bch.pid +PIDFile=/run/bitcoin-abc/bcash.pid Restart=on-failure # Resource limits diff --git a/contrib/backends/bcash/debian/changelog b/contrib/backends/bcash/debian/changelog index 352e348c..88846bc8 100644 --- a/contrib/backends/bcash/debian/changelog +++ b/contrib/backends/bcash/debian/changelog @@ -1,3 +1,9 @@ +bcash (0.17.1-satoshilabs4) unstable; urgency=medium + + * Rename packages and directories + + -- Martin Bohm Wed, 06 Jun 2018 11:12:13 +0200 + bcash (0.17.1-satoshilabs3) unstable; urgency=medium * Increased limits in backend configs diff --git a/contrib/backends/bcash/debian/control b/contrib/backends/bcash/debian/control index e7223d94..02260a06 100644 --- a/contrib/backends/bcash/debian/control +++ b/contrib/backends/bcash/debian/control @@ -5,7 +5,7 @@ Maintainer: jakub.matys@satoshilabs.com Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd, dh-exec Standards-Version: 3.9.5 -Package: bcash-bch +Package: bcash Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate Description: Satoshilabs packaged bitcoin-cash server