From 56a1711ff39adf0fd8edd7d3834fb4fdba2d1d13 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Wed, 6 Jun 2018 11:54:29 +0200 Subject: [PATCH] Rename bitcoin blockbook packages to match coin naming convention --- README.md | 6 ++--- .../blockbook-bitcoin-testnet.conffiles | 1 + .../blockbook-bitcoin-testnet.cron.daily | 2 ++ .../deb/debian/blockbook-bitcoin-testnet.dirs | 2 ++ .../debian/blockbook-bitcoin-testnet.install | 6 +++++ .../debian/blockbook-bitcoin-testnet.links | 2 ++ .../debian/blockbook-bitcoin-testnet.postinst | 23 +++++++++++++++++++ ...vice => blockbook-bitcoin-testnet.service} | 10 ++++---- build/deb/debian/blockbook-bitcoin.conffiles | 1 + build/deb/debian/blockbook-bitcoin.cron.daily | 2 ++ build/deb/debian/blockbook-bitcoin.dirs | 2 ++ build/deb/debian/blockbook-bitcoin.install | 6 +++++ build/deb/debian/blockbook-bitcoin.links | 2 ++ build/deb/debian/blockbook-bitcoin.postinst | 23 +++++++++++++++++++ ...-btc.service => blockbook-bitcoin.service} | 12 +++++----- .../debian/blockbook-btc-testnet.conffiles | 1 - .../debian/blockbook-btc-testnet.cron.daily | 2 -- build/deb/debian/blockbook-btc-testnet.dirs | 2 -- .../deb/debian/blockbook-btc-testnet.install | 6 ----- build/deb/debian/blockbook-btc-testnet.links | 2 -- .../deb/debian/blockbook-btc-testnet.postinst | 23 ------------------- build/deb/debian/blockbook-btc.conffiles | 1 - build/deb/debian/blockbook-btc.cron.daily | 2 -- build/deb/debian/blockbook-btc.dirs | 2 -- build/deb/debian/blockbook-btc.install | 6 ----- build/deb/debian/blockbook-btc.links | 2 -- build/deb/debian/blockbook-btc.postinst | 23 ------------------- build/deb/debian/changelog | 6 +++++ build/deb/debian/control | 6 ++--- 29 files changed, 95 insertions(+), 89 deletions(-) create mode 100644 build/deb/debian/blockbook-bitcoin-testnet.conffiles create mode 100644 build/deb/debian/blockbook-bitcoin-testnet.cron.daily create mode 100644 build/deb/debian/blockbook-bitcoin-testnet.dirs create mode 100755 build/deb/debian/blockbook-bitcoin-testnet.install create mode 100644 build/deb/debian/blockbook-bitcoin-testnet.links create mode 100644 build/deb/debian/blockbook-bitcoin-testnet.postinst rename build/deb/debian/{blockbook-btc-testnet.service => blockbook-bitcoin-testnet.service} (61%) create mode 100644 build/deb/debian/blockbook-bitcoin.conffiles create mode 100644 build/deb/debian/blockbook-bitcoin.cron.daily create mode 100644 build/deb/debian/blockbook-bitcoin.dirs create mode 100755 build/deb/debian/blockbook-bitcoin.install create mode 100644 build/deb/debian/blockbook-bitcoin.links create mode 100644 build/deb/debian/blockbook-bitcoin.postinst rename build/deb/debian/{blockbook-btc.service => blockbook-bitcoin.service} (62%) delete mode 100644 build/deb/debian/blockbook-btc-testnet.conffiles delete mode 100644 build/deb/debian/blockbook-btc-testnet.cron.daily delete mode 100644 build/deb/debian/blockbook-btc-testnet.dirs delete mode 100755 build/deb/debian/blockbook-btc-testnet.install delete mode 100644 build/deb/debian/blockbook-btc-testnet.links delete mode 100644 build/deb/debian/blockbook-btc-testnet.postinst delete mode 100644 build/deb/debian/blockbook-btc.conffiles delete mode 100644 build/deb/debian/blockbook-btc.cron.daily delete mode 100644 build/deb/debian/blockbook-btc.dirs delete mode 100755 build/deb/debian/blockbook-btc.install delete mode 100644 build/deb/debian/blockbook-btc.links delete mode 100644 build/deb/debian/blockbook-btc.postinst diff --git a/README.md b/README.md index 33a9f154..bce3e1a8 100644 --- a/README.md +++ b/README.md @@ -74,14 +74,14 @@ Blockbook logs only to stderr, logging to files is disabled. Verbosity of logs c # Supported coins -- [BTC](bchain/coins/btc/btc.md) -- [BTC Testnet](bchain/coins/btc/btctestnet.md) +- [Bitcoin](bchain/coins/btc/btc.md) +- [Bitcoin Testnet](bchain/coins/btc/btctestnet.md) - BCH - BCH Testnet - [ZCash](bchain/coins/zec/zec.md) - ZCash Testnet - [Ethereum](bchain/coins/eth/eth.md) -- [Ethereum Ropsten Testnet](bchain/coins/eth/ethropsten.md) +- [Ethereum Testnet Ropsten](bchain/coins/eth/ethropsten.md) # Data storage in RocksDB diff --git a/build/deb/debian/blockbook-bitcoin-testnet.conffiles b/build/deb/debian/blockbook-bitcoin-testnet.conffiles new file mode 100644 index 00000000..92125db8 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin-testnet.conffiles @@ -0,0 +1 @@ +/opt/coins/blockbook/bitcoin_testnet/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-bitcoin-testnet.cron.daily b/build/deb/debian/blockbook-bitcoin-testnet.cron.daily new file mode 100644 index 00000000..df131d31 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin-testnet.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/coins/blockbook/bitcoin_testnet/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-bitcoin-testnet.dirs b/build/deb/debian/blockbook-bitcoin-testnet.dirs new file mode 100644 index 00000000..a18466ea --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin-testnet.dirs @@ -0,0 +1,2 @@ +/opt/coins/data/bitcoin_testnet/blockbook +/opt/coins/blockbook/bitcoin_testnet/logs diff --git a/build/deb/debian/blockbook-bitcoin-testnet.install b/build/deb/debian/blockbook-bitcoin-testnet.install new file mode 100755 index 00000000..aae85658 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin-testnet.install @@ -0,0 +1,6 @@ +#!/usr/bin/dh-exec +blockbook /opt/coins/blockbook/bitcoin_testnet/bin +cert /opt/coins/blockbook/bitcoin_testnet +static /opt/coins/blockbook/bitcoin_testnet +configs/bitcoin_testnet.json => /opt/coins/blockbook/bitcoin_testnet/config/blockchaincfg.json +logrotate.sh /opt/coins/blockbook/bitcoin_testnet/bin diff --git a/build/deb/debian/blockbook-bitcoin-testnet.links b/build/deb/debian/blockbook-bitcoin-testnet.links new file mode 100644 index 00000000..f60dbadf --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin-testnet.links @@ -0,0 +1,2 @@ +/opt/coins/blockbook/bitcoin_testnet/cert/testcert.crt /opt/coins/blockbook/bitcoin_testnet/cert/blockbook.crt +/opt/coins/blockbook/bitcoin_testnet/cert/testcert.key /opt/coins/blockbook/bitcoin_testnet/cert/blockbook.key diff --git a/build/deb/debian/blockbook-bitcoin-testnet.postinst b/build/deb/debian/blockbook-bitcoin-testnet.postinst new file mode 100644 index 00000000..8f4637ce --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin-testnet.postinst @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +case "$1" in + + configure) + if ! id -u blockbook-bitcoin &> /dev/null + then + useradd --system -M -U blockbook-bitcoin -s /bin/false + fi + + for dir in /opt/coins/data/bitcoin_testnet/blockbook /opt/coins/blockbook/bitcoin_testnet/logs + do + if [ "$(stat -c '%U' $dir)" != "blockbook-bitcoin" ] + then + chown -R blockbook-bitcoin:blockbook-bitcoin $dir + fi + done + ;; + +esac + +#DEBHELPER# diff --git a/build/deb/debian/blockbook-btc-testnet.service b/build/deb/debian/blockbook-bitcoin-testnet.service similarity index 61% rename from build/deb/debian/blockbook-btc-testnet.service rename to build/deb/debian/blockbook-bitcoin-testnet.service index cf35f6d8..1e24c2c2 100644 --- a/build/deb/debian/blockbook-btc-testnet.service +++ b/build/deb/debian/blockbook-bitcoin-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-btc-testnet.service +# $ systemctl edit blockbook-bitcoin-testnet.service # See "man systemd.service" for details. [Unit] -Description=Blockbook daemon (BTC testnet) +Description=Blockbook daemon (Bitcoin testnet) After=network.target Wants=bitcoin-testnet.service [Service] -ExecStart=/opt/coins/blockbook/btc-testnet/bin/blockbook -coin=btc-testnet -blockchaincfg=/opt/coins/blockbook/btc-testnet/config/blockchaincfg.json -datadir=/opt/coins/data/btc-testnet/blockbook/db -sync -httpserver=:19030 -socketio=:19130 -certfile=/opt/coins/blockbook/btc-testnet/cert/blockbook -explorer=https://btc-testnet-explorer.trezor.io/ -log_dir=/opt/coins/blockbook/btc-testnet/logs -User=blockbook-btc +ExecStart=/opt/coins/blockbook/bitcoin_testnet/bin/blockbook -blockchaincfg=/opt/coins/blockbook/bitcoin_testnet/config/blockchaincfg.json -datadir=/opt/coins/data/bitcoin_testnet/blockbook/db -sync -httpserver=:19030 -socketio=:19130 -certfile=/opt/coins/blockbook/bitcoin_testnet/cert/blockbook -explorer=https://btc-testnet-explorer.trezor.io/ -log_dir=/opt/coins/blockbook/bitcoin_testnet/logs +User=blockbook-bitcoin Type=simple Restart=on-failure -WorkingDirectory=/opt/coins/blockbook/btc-testnet +WorkingDirectory=/opt/coins/blockbook/bitcoin_testnet # Resource limits LimitNOFILE=500000 diff --git a/build/deb/debian/blockbook-bitcoin.conffiles b/build/deb/debian/blockbook-bitcoin.conffiles new file mode 100644 index 00000000..bfdf0a35 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin.conffiles @@ -0,0 +1 @@ +/opt/coins/blockbook/bitcoin/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-bitcoin.cron.daily b/build/deb/debian/blockbook-bitcoin.cron.daily new file mode 100644 index 00000000..87303379 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/coins/blockbook/bitcoin/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-bitcoin.dirs b/build/deb/debian/blockbook-bitcoin.dirs new file mode 100644 index 00000000..342d1763 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin.dirs @@ -0,0 +1,2 @@ +/opt/coins/data/bitcoin/blockbook +/opt/coins/blockbook/bitcoin/logs diff --git a/build/deb/debian/blockbook-bitcoin.install b/build/deb/debian/blockbook-bitcoin.install new file mode 100755 index 00000000..23cf878e --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin.install @@ -0,0 +1,6 @@ +#!/usr/bin/dh-exec +blockbook /opt/coins/blockbook/bitcoin/bin +cert /opt/coins/blockbook/bitcoin +static /opt/coins/blockbook/bitcoin +configs/bitcoin.json => /opt/coins/blockbook/bitcoin/config/blockchaincfg.json +logrotate.sh /opt/coins/blockbook/bitcoin/bin diff --git a/build/deb/debian/blockbook-bitcoin.links b/build/deb/debian/blockbook-bitcoin.links new file mode 100644 index 00000000..322c6cf1 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin.links @@ -0,0 +1,2 @@ +/opt/coins/blockbook/bitcoin/cert/testcert.crt /opt/coins/blockbook/bitcoin/cert/blockbook.crt +/opt/coins/blockbook/bitcoin/cert/testcert.key /opt/coins/blockbook/bitcoin/cert/blockbook.key diff --git a/build/deb/debian/blockbook-bitcoin.postinst b/build/deb/debian/blockbook-bitcoin.postinst new file mode 100644 index 00000000..87945f88 --- /dev/null +++ b/build/deb/debian/blockbook-bitcoin.postinst @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +case "$1" in + + configure) + if ! id -u blockbook-bitcoin &> /dev/null + then + useradd --system -M -U blockbook-bitcoin -s /bin/false + fi + + for dir in /opt/coins/data/bitcoin/blockbook /opt/coins/blockbook/bitcoin/logs + do + if [ "$(stat -c '%U' $dir)" != "blockbook-bitcoin" ] + then + chown -R blockbook-bitcoin:blockbook-bitcoin $dir + fi + done + ;; + +esac + +#DEBHELPER# diff --git a/build/deb/debian/blockbook-btc.service b/build/deb/debian/blockbook-bitcoin.service similarity index 62% rename from build/deb/debian/blockbook-btc.service rename to build/deb/debian/blockbook-bitcoin.service index 4273ad31..c3b1b193 100644 --- a/build/deb/debian/blockbook-btc.service +++ b/build/deb/debian/blockbook-bitcoin.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-btc.service +# $ systemctl edit blockbook-bitcoin.service # See "man systemd.service" for details. [Unit] -Description=Blockbook daemon (BTC mainnet) +Description=Blockbook daemon (Bitcoin mainnet) After=network.target -Wants=bitcoin-btc.service +Wants=bitcoin.service [Service] -ExecStart=/opt/coins/blockbook/btc/bin/blockbook -coin=btc -blockchaincfg=/opt/coins/blockbook/btc/config/blockchaincfg.json -datadir=/opt/coins/data/btc/blockbook/db -sync -httpserver=:9030 -socketio=:9130 -certfile=/opt/coins/blockbook/btc/cert/blockbook -explorer=https://btc-explorer.trezor.io/ -log_dir=/opt/coins/blockbook/btc/logs -User=blockbook-btc +ExecStart=/opt/coins/blockbook/bitcoin/bin/blockbook -blockchaincfg=/opt/coins/blockbook/bitcoin/config/blockchaincfg.json -datadir=/opt/coins/data/bitcoin/blockbook/db -sync -httpserver=:9030 -socketio=:9130 -certfile=/opt/coins/blockbook/bitcoin/cert/blockbook -explorer=https://btc-explorer.trezor.io/ -log_dir=/opt/coins/blockbook/bitcoin/logs +User=blockbook-bitcoin Type=simple Restart=on-failure -WorkingDirectory=/opt/coins/blockbook/btc +WorkingDirectory=/opt/coins/blockbook/bitcoin # Resource limits LimitNOFILE=500000 diff --git a/build/deb/debian/blockbook-btc-testnet.conffiles b/build/deb/debian/blockbook-btc-testnet.conffiles deleted file mode 100644 index b7e2930b..00000000 --- a/build/deb/debian/blockbook-btc-testnet.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/blockbook/btc-testnet/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-btc-testnet.cron.daily b/build/deb/debian/blockbook-btc-testnet.cron.daily deleted file mode 100644 index 4a3fa5cd..00000000 --- a/build/deb/debian/blockbook-btc-testnet.cron.daily +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/coins/blockbook/btc-testnet/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-btc-testnet.dirs b/build/deb/debian/blockbook-btc-testnet.dirs deleted file mode 100644 index 04a70a52..00000000 --- a/build/deb/debian/blockbook-btc-testnet.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/data/btc-testnet/blockbook -/opt/coins/blockbook/btc-testnet/logs diff --git a/build/deb/debian/blockbook-btc-testnet.install b/build/deb/debian/blockbook-btc-testnet.install deleted file mode 100755 index 5fe355ef..00000000 --- a/build/deb/debian/blockbook-btc-testnet.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -blockbook /opt/coins/blockbook/btc-testnet/bin -cert /opt/coins/blockbook/btc-testnet -static /opt/coins/blockbook/btc-testnet -configs/btc-testnet.json => /opt/coins/blockbook/btc-testnet/config/blockchaincfg.json -logrotate.sh /opt/coins/blockbook/btc-testnet/bin diff --git a/build/deb/debian/blockbook-btc-testnet.links b/build/deb/debian/blockbook-btc-testnet.links deleted file mode 100644 index 6bf90efe..00000000 --- a/build/deb/debian/blockbook-btc-testnet.links +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/blockbook/btc-testnet/cert/testcert.crt /opt/coins/blockbook/btc-testnet/cert/blockbook.crt -/opt/coins/blockbook/btc-testnet/cert/testcert.key /opt/coins/blockbook/btc-testnet/cert/blockbook.key diff --git a/build/deb/debian/blockbook-btc-testnet.postinst b/build/deb/debian/blockbook-btc-testnet.postinst deleted file mode 100644 index e5097cb5..00000000 --- a/build/deb/debian/blockbook-btc-testnet.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -case "$1" in - - configure) - if ! id -u blockbook-btc &> /dev/null - then - useradd --system -M -U blockbook-btc -s /bin/false - fi - - for dir in /opt/coins/data/btc-testnet/blockbook /opt/coins/blockbook/btc-testnet/logs - do - if [ "$(stat -c '%U' $dir)" != "blockbook-btc" ] - then - chown -R blockbook-btc:blockbook-btc $dir - fi - done - ;; - -esac - -#DEBHELPER# diff --git a/build/deb/debian/blockbook-btc.conffiles b/build/deb/debian/blockbook-btc.conffiles deleted file mode 100644 index 9fe092c2..00000000 --- a/build/deb/debian/blockbook-btc.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/blockbook/btc/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-btc.cron.daily b/build/deb/debian/blockbook-btc.cron.daily deleted file mode 100644 index 7516ccee..00000000 --- a/build/deb/debian/blockbook-btc.cron.daily +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/coins/blockbook/btc/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-btc.dirs b/build/deb/debian/blockbook-btc.dirs deleted file mode 100644 index 55205d1e..00000000 --- a/build/deb/debian/blockbook-btc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/data/btc/blockbook -/opt/coins/blockbook/btc/logs diff --git a/build/deb/debian/blockbook-btc.install b/build/deb/debian/blockbook-btc.install deleted file mode 100755 index e9c11963..00000000 --- a/build/deb/debian/blockbook-btc.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -blockbook /opt/coins/blockbook/btc/bin -cert /opt/coins/blockbook/btc -static /opt/coins/blockbook/btc -configs/btc.json => /opt/coins/blockbook/btc/config/blockchaincfg.json -logrotate.sh /opt/coins/blockbook/btc/bin diff --git a/build/deb/debian/blockbook-btc.links b/build/deb/debian/blockbook-btc.links deleted file mode 100644 index 71e45b5e..00000000 --- a/build/deb/debian/blockbook-btc.links +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/blockbook/btc/cert/testcert.crt /opt/coins/blockbook/btc/cert/blockbook.crt -/opt/coins/blockbook/btc/cert/testcert.key /opt/coins/blockbook/btc/cert/blockbook.key diff --git a/build/deb/debian/blockbook-btc.postinst b/build/deb/debian/blockbook-btc.postinst deleted file mode 100644 index 87dcf12a..00000000 --- a/build/deb/debian/blockbook-btc.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -case "$1" in - - configure) - if ! id -u blockbook-btc &> /dev/null - then - useradd --system -M -U blockbook-btc -s /bin/false - fi - - for dir in /opt/coins/data/btc/blockbook /opt/coins/blockbook/btc/logs - do - if [ "$(stat -c '%U' $dir)" != "blockbook-btc" ] - then - chown -R blockbook-btc:blockbook-btc $dir - fi - done - ;; - -esac - -#DEBHELPER# diff --git a/build/deb/debian/changelog b/build/deb/debian/changelog index 73694abf..b5215893 100644 --- a/build/deb/debian/changelog +++ b/build/deb/debian/changelog @@ -1,3 +1,9 @@ +blockbook (0.0.5) unstable; urgency=medium + + * v0.0.5, renamed packages and coins + + -- Martin Bohm Wed, 06 Jun 2018 11:12:13 +0200 + blockbook (0.0.4) unstable; urgency=medium * v0.0.4 diff --git a/build/deb/debian/control b/build/deb/debian/control index e89d6b5a..93c828bf 100644 --- a/build/deb/debian/control +++ b/build/deb/debian/control @@ -10,12 +10,12 @@ Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Satoshilabs blockbook server (tools) -Package: blockbook-btc +Package: blockbook-bitcoin Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bitcoin-btc +Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bitcoin Description: Satoshilabs blockbook server (Bitcoin mainnet) -Package: blockbook-btc-testnet +Package: blockbook-bitcoin-testnet Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bitcoin-testnet Description: Satoshilabs blockbook server (Bitcoin testnet)