diff --git a/README.md b/README.md index 0a39d0da..16d31f47 100644 --- a/README.md +++ b/README.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 | -|--------------------------|---------------------|--------------------------|----------|----------| -| 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* | +| coin | blockbook http port | blockbook socket.io port | backend 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 | 38337* | +| xem | 9038 | 9138 | 8038 | 38338 | +| 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/bchain/coins/blockchain.go b/bchain/coins/blockchain.go index 8295cb29..e7eabd9e 100644 --- a/bchain/coins/blockchain.go +++ b/bchain/coins/blockchain.go @@ -24,8 +24,8 @@ var blockChainFactories = make(map[string]blockChainFactory) func init() { blockChainFactories["Bitcoin"] = btc.NewBitcoinRPC blockChainFactories["Testnet"] = btc.NewBitcoinRPC - blockChainFactories["zec"] = zec.NewZCashRPC - blockChainFactories["zec-testnet"] = zec.NewZCashRPC + blockChainFactories["Zcash"] = zec.NewZCashRPC + blockChainFactories["Zcash Testnet"] = zec.NewZCashRPC blockChainFactories["Ethereum"] = eth.NewEthereumRPC blockChainFactories["Ethereum Testnet Ropsten"] = eth.NewEthereumRPC blockChainFactories["Bcash"] = bch.NewBCashRPC diff --git a/build/deb/debian/blockbook-zcash-testnet.conffiles b/build/deb/debian/blockbook-zcash-testnet.conffiles new file mode 100644 index 00000000..eead94ec --- /dev/null +++ b/build/deb/debian/blockbook-zcash-testnet.conffiles @@ -0,0 +1 @@ +/opt/coins/blockbook/zcash_testnet/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-zcash-testnet.cron.daily b/build/deb/debian/blockbook-zcash-testnet.cron.daily new file mode 100644 index 00000000..7a1c1565 --- /dev/null +++ b/build/deb/debian/blockbook-zcash-testnet.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/coins/blockbook/zcash_testnet/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-zcash-testnet.dirs b/build/deb/debian/blockbook-zcash-testnet.dirs new file mode 100644 index 00000000..a0192aa5 --- /dev/null +++ b/build/deb/debian/blockbook-zcash-testnet.dirs @@ -0,0 +1,2 @@ +/opt/coins/data/zcash_testnet/blockbook +/opt/coins/blockbook/zcash_testnet/logs diff --git a/build/deb/debian/blockbook-zcash-testnet.install b/build/deb/debian/blockbook-zcash-testnet.install new file mode 100755 index 00000000..7b3a38bb --- /dev/null +++ b/build/deb/debian/blockbook-zcash-testnet.install @@ -0,0 +1,6 @@ +#!/usr/bin/dh-exec --with=install +blockbook /opt/coins/blockbook/zcash_testnet/bin +cert /opt/coins/blockbook/zcash_testnet +static /opt/coins/blockbook/zcash_testnet +configs/zcash_testnet.json => /opt/coins/blockbook/zcash_testnet/config/blockchaincfg.json +logrotate.sh /opt/coins/blockbook/zcash_testnet/bin diff --git a/build/deb/debian/blockbook-zcash-testnet.links b/build/deb/debian/blockbook-zcash-testnet.links new file mode 100644 index 00000000..91974b23 --- /dev/null +++ b/build/deb/debian/blockbook-zcash-testnet.links @@ -0,0 +1,2 @@ +/opt/coins/blockbook/zcash_testnet/cert/testcert.crt /opt/coins/blockbook/zcash_testnet/cert/blockbook.crt +/opt/coins/blockbook/zcash_testnet/cert/testcert.key /opt/coins/blockbook/zcash_testnet/cert/blockbook.key diff --git a/build/deb/debian/blockbook-zcash-testnet.postinst b/build/deb/debian/blockbook-zcash-testnet.postinst new file mode 100644 index 00000000..992d1cc7 --- /dev/null +++ b/build/deb/debian/blockbook-zcash-testnet.postinst @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +case "$1" in + + configure) + if ! id -u blockbook-zcash &> /dev/null + then + useradd --system -M -U blockbook-zcash -s /bin/false + fi + + for dir in /opt/coins/data/zcash_testnet/blockbook /opt/coins/blockbook/zcash_testnet/logs + do + if [ "$(stat -c '%U' $dir)" != "blockbook-zcash" ] + then + chown -R blockbook-zcash:blockbook-zcash $dir + fi + done + ;; + +esac + +#DEBHELPER# diff --git a/build/deb/debian/blockbook-zec-testnet.service b/build/deb/debian/blockbook-zcash-testnet.service similarity index 60% rename from build/deb/debian/blockbook-zec-testnet.service rename to build/deb/debian/blockbook-zcash-testnet.service index 69e5dea6..893d8c46 100644 --- a/build/deb/debian/blockbook-zec-testnet.service +++ b/build/deb/debian/blockbook-zcash-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-zec-testnet.service +# $ systemctl edit blockbook-zcash-testnet.service # See "man systemd.service" for details. [Unit] -Description=Blockbook daemon (ZEC testnet) +Description=Blockbook daemon (Zcash Testnet) After=network.target -Wants=zcash-zec-testnet.service +Wants=zcash-testnet.service [Service] -ExecStart=/opt/coins/blockbook/zec-testnet/bin/blockbook -coin=zec-testnet -blockchaincfg=/opt/coins/blockbook/zec-testnet/config/blockchaincfg.json -datadir=/opt/coins/data/zec-testnet/blockbook/db -sync -httpserver=:19032 -socketio=:19132 -certfile=/opt/coins/blockbook/zec-testnet/cert/blockbook -explorer=https://zcash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/zec-testnet/logs -User=blockbook-zec +ExecStart=/opt/coins/blockbook/zcash_testnet/bin/blockbook -blockchaincfg=/opt/coins/blockbook/zcash_testnet/config/blockchaincfg.json -datadir=/opt/coins/data/zcash_testnet/blockbook/db -sync -httpserver=:19032 -socketio=:19132 -certfile=/opt/coins/blockbook/zcash_testnet/cert/blockbook -explorer=https://zcash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/zcash_testnet/logs +User=blockbook-zcash Type=simple Restart=on-failure -WorkingDirectory=/opt/coins/blockbook/zec-testnet +WorkingDirectory=/opt/coins/blockbook/zcash_testnet # Resource limits LimitNOFILE=500000 diff --git a/build/deb/debian/blockbook-zcash.conffiles b/build/deb/debian/blockbook-zcash.conffiles new file mode 100644 index 00000000..fe178b66 --- /dev/null +++ b/build/deb/debian/blockbook-zcash.conffiles @@ -0,0 +1 @@ +/opt/coins/blockbook/zcash/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-zcash.cron.daily b/build/deb/debian/blockbook-zcash.cron.daily new file mode 100644 index 00000000..1d5ffc06 --- /dev/null +++ b/build/deb/debian/blockbook-zcash.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/coins/blockbook/zcash/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-zcash.dirs b/build/deb/debian/blockbook-zcash.dirs new file mode 100644 index 00000000..9f54ae06 --- /dev/null +++ b/build/deb/debian/blockbook-zcash.dirs @@ -0,0 +1,2 @@ +/opt/coins/data/zcash/blockbook +/opt/coins/blockbook/zcash/logs diff --git a/build/deb/debian/blockbook-zcash.install b/build/deb/debian/blockbook-zcash.install new file mode 100755 index 00000000..5305ac28 --- /dev/null +++ b/build/deb/debian/blockbook-zcash.install @@ -0,0 +1,6 @@ +#!/usr/bin/dh-exec --with=install +blockbook /opt/coins/blockbook/zcash/bin +cert /opt/coins/blockbook/zcash +static /opt/coins/blockbook/zcash +configs/zcash.json => /opt/coins/blockbook/zcash/config/blockchaincfg.json +logrotate.sh /opt/coins/blockbook/zcash/bin diff --git a/build/deb/debian/blockbook-zcash.links b/build/deb/debian/blockbook-zcash.links new file mode 100644 index 00000000..4184e473 --- /dev/null +++ b/build/deb/debian/blockbook-zcash.links @@ -0,0 +1,2 @@ +/opt/coins/blockbook/zcash/cert/testcert.crt /opt/coins/blockbook/zcash/cert/blockbook.crt +/opt/coins/blockbook/zcash/cert/testcert.key /opt/coins/blockbook/zcash/cert/blockbook.key diff --git a/build/deb/debian/blockbook-zcash.postinst b/build/deb/debian/blockbook-zcash.postinst new file mode 100644 index 00000000..a3b70cbd --- /dev/null +++ b/build/deb/debian/blockbook-zcash.postinst @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +case "$1" in + + configure) + if ! id -u blockbook-zcash &> /dev/null + then + useradd --system -M -U blockbook-zcash -s /bin/false + fi + + for dir in /opt/coins/data/zcash/blockbook /opt/coins/blockbook/zcash/logs + do + if [ "$(stat -c '%U' $dir)" != "blockbook-zcash" ] + then + chown -R blockbook-zcash:blockbook-zcash $dir + fi + done + ;; + +esac + +#DEBHELPER# diff --git a/build/deb/debian/blockbook-zec.service b/build/deb/debian/blockbook-zcash.service similarity index 63% rename from build/deb/debian/blockbook-zec.service rename to build/deb/debian/blockbook-zcash.service index 372f1121..f704b48f 100644 --- a/build/deb/debian/blockbook-zec.service +++ b/build/deb/debian/blockbook-zcash.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-zec.service +# $ systemctl edit blockbook-zcash.service # See "man systemd.service" for details. [Unit] -Description=Blockbook daemon (ZEC mainnet) +Description=Blockbook daemon (Zcash mainnet) After=network.target -Wants=zcash-zec.service +Wants=zcash.service [Service] -ExecStart=/opt/coins/blockbook/zec/bin/blockbook -coin=zec -blockchaincfg=/opt/coins/blockbook/zec/config/blockchaincfg.json -datadir=/opt/coins/data/zec/blockbook/db -sync -httpserver=:9032 -socketio=:9132 -certfile=/opt/coins/blockbook/zec/cert/blockbook -explorer=https://zcash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/zec/logs -User=blockbook-zec +ExecStart=/opt/coins/blockbook/zcash/bin/blockbook -blockchaincfg=/opt/coins/blockbook/zcash/config/blockchaincfg.json -datadir=/opt/coins/data/zcash/blockbook/db -sync -httpserver=:9032 -socketio=:9132 -certfile=/opt/coins/blockbook/zcash/cert/blockbook -explorer=https://zcash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/zcash/logs +User=blockbook-zcash Type=simple Restart=on-failure -WorkingDirectory=/opt/coins/blockbook/zec +WorkingDirectory=/opt/coins/blockbook/zcash # Resource limits LimitNOFILE=500000 diff --git a/build/deb/debian/blockbook-zec-testnet.conffiles b/build/deb/debian/blockbook-zec-testnet.conffiles deleted file mode 100644 index e5212acb..00000000 --- a/build/deb/debian/blockbook-zec-testnet.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/blockbook/zec-testnet/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-zec-testnet.cron.daily b/build/deb/debian/blockbook-zec-testnet.cron.daily deleted file mode 100644 index 4302f1a1..00000000 --- a/build/deb/debian/blockbook-zec-testnet.cron.daily +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/coins/blockbook/zec-testnet/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-zec-testnet.dirs b/build/deb/debian/blockbook-zec-testnet.dirs deleted file mode 100644 index ae909942..00000000 --- a/build/deb/debian/blockbook-zec-testnet.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/data/zec-testnet/blockbook -/opt/coins/blockbook/zec-testnet/logs diff --git a/build/deb/debian/blockbook-zec-testnet.install b/build/deb/debian/blockbook-zec-testnet.install deleted file mode 100755 index f8640fdc..00000000 --- a/build/deb/debian/blockbook-zec-testnet.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec --with=install -blockbook /opt/coins/blockbook/zec-testnet/bin -cert /opt/coins/blockbook/zec-testnet -static /opt/coins/blockbook/zec-testnet -configs/zec-testnet.json => /opt/coins/blockbook/zec-testnet/config/blockchaincfg.json -logrotate.sh /opt/coins/blockbook/zec-testnet/bin diff --git a/build/deb/debian/blockbook-zec-testnet.links b/build/deb/debian/blockbook-zec-testnet.links deleted file mode 100644 index 40a764a9..00000000 --- a/build/deb/debian/blockbook-zec-testnet.links +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/blockbook/zec-testnet/cert/testcert.crt /opt/coins/blockbook/zec-testnet/cert/blockbook.crt -/opt/coins/blockbook/zec-testnet/cert/testcert.key /opt/coins/blockbook/zec-testnet/cert/blockbook.key diff --git a/build/deb/debian/blockbook-zec-testnet.postinst b/build/deb/debian/blockbook-zec-testnet.postinst deleted file mode 100644 index fcbc854c..00000000 --- a/build/deb/debian/blockbook-zec-testnet.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -case "$1" in - - configure) - if ! id -u blockbook-zec &> /dev/null - then - useradd --system -M -U blockbook-zec -s /bin/false - fi - - for dir in /opt/coins/data/zec-testnet/blockbook /opt/coins/blockbook/zec-testnet/logs - do - if [ "$(stat -c '%U' $dir)" != "blockbook-zec" ] - then - chown -R blockbook-zec:blockbook-zec $dir - fi - done - ;; - -esac - -#DEBHELPER# diff --git a/build/deb/debian/blockbook-zec.conffiles b/build/deb/debian/blockbook-zec.conffiles deleted file mode 100644 index fbf05888..00000000 --- a/build/deb/debian/blockbook-zec.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/blockbook/zec/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-zec.cron.daily b/build/deb/debian/blockbook-zec.cron.daily deleted file mode 100644 index 03b09708..00000000 --- a/build/deb/debian/blockbook-zec.cron.daily +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/coins/blockbook/zec/bin/logrotate.sh diff --git a/build/deb/debian/blockbook-zec.dirs b/build/deb/debian/blockbook-zec.dirs deleted file mode 100644 index 5dc7b52f..00000000 --- a/build/deb/debian/blockbook-zec.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/data/zec/blockbook -/opt/coins/blockbook/zec/logs diff --git a/build/deb/debian/blockbook-zec.install b/build/deb/debian/blockbook-zec.install deleted file mode 100755 index cc3cb553..00000000 --- a/build/deb/debian/blockbook-zec.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec --with=install -blockbook /opt/coins/blockbook/zec/bin -cert /opt/coins/blockbook/zec -static /opt/coins/blockbook/zec -configs/zec.json => /opt/coins/blockbook/zec/config/blockchaincfg.json -logrotate.sh /opt/coins/blockbook/zec/bin diff --git a/build/deb/debian/blockbook-zec.links b/build/deb/debian/blockbook-zec.links deleted file mode 100644 index 083005f8..00000000 --- a/build/deb/debian/blockbook-zec.links +++ /dev/null @@ -1,2 +0,0 @@ -/opt/coins/blockbook/zec/cert/testcert.crt /opt/coins/blockbook/zec/cert/blockbook.crt -/opt/coins/blockbook/zec/cert/testcert.key /opt/coins/blockbook/zec/cert/blockbook.key diff --git a/build/deb/debian/blockbook-zec.postinst b/build/deb/debian/blockbook-zec.postinst deleted file mode 100644 index e3018848..00000000 --- a/build/deb/debian/blockbook-zec.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -case "$1" in - - configure) - if ! id -u blockbook-zec &> /dev/null - then - useradd --system -M -U blockbook-zec -s /bin/false - fi - - for dir in /opt/coins/data/zec/blockbook /opt/coins/blockbook/zec/logs - do - if [ "$(stat -c '%U' $dir)" != "blockbook-zec" ] - then - chown -R blockbook-zec:blockbook-zec $dir - fi - done - ;; - -esac - -#DEBHELPER# diff --git a/build/deb/debian/control b/build/deb/debian/control index 3acfb8fa..2b8ed471 100644 --- a/build/deb/debian/control +++ b/build/deb/debian/control @@ -20,12 +20,12 @@ Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, bitcoin-testnet Description: Satoshilabs blockbook server (Bitcoin testnet) -Package: blockbook-zec +Package: blockbook-zcash Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, zcash-zec +Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, zcash Description: Satoshilabs blockbook server (ZCash mainnet) -Package: blockbook-zec-testnet +Package: blockbook-zcash-testnet Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils, passwd, findutils, psmisc, zcash-testnet Description: Satoshilabs blockbook server (ZCash testnet) diff --git a/configs/zec.json b/configs/zcash.json similarity index 90% rename from configs/zec.json rename to configs/zcash.json index b957b110..e9f0126f 100644 --- a/configs/zec.json +++ b/configs/zcash.json @@ -1,4 +1,5 @@ { + "coin_name": "Zcash", "rpcURL": "http://127.0.0.1:8032", "rpcUser": "rpc", "rpcPass": "rpc", @@ -8,4 +9,4 @@ "mempoolWorkers": 4, "mempoolSubWorkers": 8, "blockAddressesToKeep": 300 -} +} \ No newline at end of file diff --git a/configs/zec-testnet.json b/configs/zcash_testnet.json similarity index 87% rename from configs/zec-testnet.json rename to configs/zcash_testnet.json index 9dece778..6196bb76 100644 --- a/configs/zec-testnet.json +++ b/configs/zcash_testnet.json @@ -1,4 +1,5 @@ { + "coin_name": "Zcash Testnet", "rpcURL": "http://127.0.0.1:18032", "rpcUser": "rpc", "rpcPass": "rpc", @@ -8,4 +9,4 @@ "mempoolWorkers": 4, "mempoolSubWorkers": 8, "blockAddressesToKeep": 300 -} +} \ No newline at end of file diff --git a/contrib/backends/zcash/debian/changelog b/contrib/backends/zcash/debian/changelog index 2d5a804e..87e536d7 100644 --- a/contrib/backends/zcash/debian/changelog +++ b/contrib/backends/zcash/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.15-satoshilabs5) unstable; urgency=medium + + * Rename packages and directories + + -- Martin Bohm Wed, 06 Jun 2018 11:12:13 +0200 + zcash (1.0.15-satoshilabs4) unstable; urgency=medium * Increased limits in backend config diff --git a/contrib/backends/zcash/debian/control b/contrib/backends/zcash/debian/control index aa94da62..a94c9622 100644 --- a/contrib/backends/zcash/debian/control +++ b/contrib/backends/zcash/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: zcash-zec +Package: zcash Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate Description: Satoshilabs packaged zcash server diff --git a/contrib/backends/zcash/debian/zcash-testnet.conffiles b/contrib/backends/zcash/debian/zcash-testnet.conffiles index 0b9e398d..a3aaf070 100644 --- a/contrib/backends/zcash/debian/zcash-testnet.conffiles +++ b/contrib/backends/zcash/debian/zcash-testnet.conffiles @@ -1 +1 @@ -/opt/coins/nodes/zcash/zec-testnet/zec-testnet.conf +/opt/coins/nodes/zcash_testnet/zcash_testnet.conf diff --git a/contrib/backends/zcash/debian/zcash-testnet.dirs b/contrib/backends/zcash/debian/zcash-testnet.dirs index 513c4b77..a5269275 100644 --- a/contrib/backends/zcash/debian/zcash-testnet.dirs +++ b/contrib/backends/zcash/debian/zcash-testnet.dirs @@ -1 +1 @@ -/opt/coins/data/zec-testnet/zcash +/opt/coins/data/zcash_testnet/backend diff --git a/contrib/backends/zcash/debian/zcash-testnet.install b/contrib/backends/zcash/debian/zcash-testnet.install index 5f846680..92be786e 100644 --- a/contrib/backends/zcash/debian/zcash-testnet.install +++ b/contrib/backends/zcash/debian/zcash-testnet.install @@ -1,2 +1,2 @@ -zcash/* /opt/coins/nodes/zcash/zec-testnet -zec-testnet.conf /opt/coins/nodes/zcash/zec-testnet +zcash/* /opt/coins/nodes/zcash_testnet +zcash_testnet.conf /opt/coins/nodes/zcash_testnet diff --git a/contrib/backends/zcash/debian/zcash-testnet.logrotate b/contrib/backends/zcash/debian/zcash-testnet.logrotate index 8b075f62..d6ebcb40 100644 --- a/contrib/backends/zcash/debian/zcash-testnet.logrotate +++ b/contrib/backends/zcash/debian/zcash-testnet.logrotate @@ -1,5 +1,5 @@ -/opt/coins/data/zec-testnet/zcash/testnet3/debug.log -/opt/coins/data/zec-testnet/zcash/testnet3/db.log +/opt/coins/data/zcash_testnet/backend/testnet3/debug.log +/opt/coins/data/zcash_testnet/backend/testnet3/db.log { rotate 7 daily diff --git a/contrib/backends/zcash/debian/zcash-testnet.postinst b/contrib/backends/zcash/debian/zcash-testnet.postinst index a5d155aa..f93bd12d 100644 --- a/contrib/backends/zcash/debian/zcash-testnet.postinst +++ b/contrib/backends/zcash/debian/zcash-testnet.postinst @@ -9,12 +9,12 @@ case "$1" in useradd --system -M -U zcash -s /bin/false fi - if [ "$(stat -c '%U' /opt/coins/data/zec-testnet/zcash)" != "zcash" ] + if [ "$(stat -c '%U' /opt/coins/data/zcash_testnet/backend)" != "zcash" ] then - chown -R zcash:zcash /opt/coins/data/zec-testnet/zcash + chown -R zcash:zcash /opt/coins/data/zcash_testnet/backend fi - HOME=/opt/coins/data/zec-testnet/zcash /opt/coins/nodes/zcash/zec-testnet/bin/zcash-fetch-params + HOME=/opt/coins/data/zcash_testnet/backend /opt/coins/nodes/zcash_testnet/bin/zcash-fetch-params ;; esac diff --git a/contrib/backends/zcash/debian/zcash-testnet.service b/contrib/backends/zcash/debian/zcash-testnet.service index 39b9fc31..427438d4 100644 --- a/contrib/backends/zcash/debian/zcash-testnet.service +++ b/contrib/backends/zcash/debian/zcash-testnet.service @@ -5,20 +5,20 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/coins/nodes/zcash/zec-testnet/zec-testnet.conf +# /opt/coins/nodes/zcash_testnet/zcash_testnet.conf [Unit] -Description=ZCash daemon (testnet) +Description=Zcash daemon (testnet) After=network.target [Service] -Environment="HOME=/opt/coins/data/zec-testnet/zcash" -ExecStart=/opt/coins/nodes/zcash/zec-testnet/bin/zcashd -datadir=/opt/coins/data/zec-testnet/zcash -conf=/opt/coins/nodes/zcash/zec-testnet/zec-testnet.conf -pid=/run/zcashd/zec-testnet.pid +Environment="HOME=/opt/coins/data/zcash_testnet/backend" +ExecStart=/opt/coins/nodes/zcash_testnet/bin/zcashd -datadir=/opt/coins/data/zcash_testnet/backend -conf=/opt/coins/nodes/zcash_testnet/zcash_testnet.conf -pid=/run/zcashd/zcash_testnet.pid # Creates /run/zcashd owned by zcash RuntimeDirectory=zcashd User=zcash Type=forking -PIDFile=/run/zcashd/zec-testnet.pid +PIDFile=/run/zcashd/zcash_testnet.pid Restart=on-failure # Resource limits diff --git a/contrib/backends/zcash/debian/zcash-zec.conffiles b/contrib/backends/zcash/debian/zcash-zec.conffiles deleted file mode 100644 index 9b19c6c3..00000000 --- a/contrib/backends/zcash/debian/zcash-zec.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/nodes/zcash/zec/zec.conf diff --git a/contrib/backends/zcash/debian/zcash-zec.dirs b/contrib/backends/zcash/debian/zcash-zec.dirs deleted file mode 100644 index f5d02e20..00000000 --- a/contrib/backends/zcash/debian/zcash-zec.dirs +++ /dev/null @@ -1 +0,0 @@ -/opt/coins/data/zec/zcash diff --git a/contrib/backends/zcash/debian/zcash-zec.install b/contrib/backends/zcash/debian/zcash-zec.install deleted file mode 100644 index 629f95b1..00000000 --- a/contrib/backends/zcash/debian/zcash-zec.install +++ /dev/null @@ -1,2 +0,0 @@ -zcash/* /opt/coins/nodes/zcash/zec -zec.conf /opt/coins/nodes/zcash/zec diff --git a/contrib/backends/zcash/debian/zcash.conffiles b/contrib/backends/zcash/debian/zcash.conffiles new file mode 100644 index 00000000..4bb34b1a --- /dev/null +++ b/contrib/backends/zcash/debian/zcash.conffiles @@ -0,0 +1 @@ +/opt/coins/nodes/zcash/zcash.conf diff --git a/contrib/backends/zcash/debian/zcash.dirs b/contrib/backends/zcash/debian/zcash.dirs new file mode 100644 index 00000000..d79f40cc --- /dev/null +++ b/contrib/backends/zcash/debian/zcash.dirs @@ -0,0 +1 @@ +/opt/coins/data/zcash/backend diff --git a/contrib/backends/zcash/debian/zcash.install b/contrib/backends/zcash/debian/zcash.install new file mode 100644 index 00000000..a641f4db --- /dev/null +++ b/contrib/backends/zcash/debian/zcash.install @@ -0,0 +1,2 @@ +zcash/* /opt/coins/nodes/zcash +zcash.conf /opt/coins/nodes/zcash diff --git a/contrib/backends/zcash/debian/zcash-zec.logrotate b/contrib/backends/zcash/debian/zcash.logrotate similarity index 58% rename from contrib/backends/zcash/debian/zcash-zec.logrotate rename to contrib/backends/zcash/debian/zcash.logrotate index ce704abb..64c98777 100644 --- a/contrib/backends/zcash/debian/zcash-zec.logrotate +++ b/contrib/backends/zcash/debian/zcash.logrotate @@ -1,5 +1,5 @@ -/opt/coins/data/zec/zcash/debug.log -/opt/coins/data/zec/zcash/db.log +/opt/coins/data/zcash/backend/debug.log +/opt/coins/data/zcash/backend/db.log { rotate 7 daily diff --git a/contrib/backends/zcash/debian/zcash-zec.postinst b/contrib/backends/zcash/debian/zcash.postinst similarity index 52% rename from contrib/backends/zcash/debian/zcash-zec.postinst rename to contrib/backends/zcash/debian/zcash.postinst index 42acc20d..0ee9132b 100644 --- a/contrib/backends/zcash/debian/zcash-zec.postinst +++ b/contrib/backends/zcash/debian/zcash.postinst @@ -9,12 +9,12 @@ case "$1" in useradd --system -M -U zcash -s /bin/false fi - if [ "$(stat -c '%U' /opt/coins/data/zec/zcash)" != "zcash" ] + if [ "$(stat -c '%U' /opt/coins/data/zcash/backend)" != "zcash" ] then - chown -R zcash:zcash /opt/coins/data/zec/zcash + chown -R zcash:zcash /opt/coins/data/zcash/backend fi - HOME=/opt/coins/data/zec/zcash /opt/coins/nodes/zcash/zec/bin/zcash-fetch-params + HOME=/opt/coins/data/zcash/backend /opt/coins/nodes/zcash/bin/zcash-fetch-params ;; esac diff --git a/contrib/backends/zcash/debian/zcash-zec.service b/contrib/backends/zcash/debian/zcash.service similarity index 75% rename from contrib/backends/zcash/debian/zcash-zec.service rename to contrib/backends/zcash/debian/zcash.service index be4457d6..2da0aba7 100644 --- a/contrib/backends/zcash/debian/zcash-zec.service +++ b/contrib/backends/zcash/debian/zcash.service @@ -1,24 +1,24 @@ # 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 zcash-zec.service +# $ systemctl edit zcash.service # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/coins/nodes/zcash/zec/zec.conf +# /opt/coins/nodes/zcash/zcash.conf [Unit] -Description=ZCash daemon (mainnet) +Description=Zcash daemon (mainnet) After=network.target [Service] -Environment="HOME=/opt/coins/data/zec/zcash" -ExecStart=/opt/coins/nodes/zcash/zec/bin/zcashd -datadir=/opt/coins/data/zec/zcash -conf=/opt/coins/nodes/zcash/zec/zec.conf -pid=/run/zcashd/zec.pid +Environment="HOME=/opt/coins/data/zcash/backend" +ExecStart=/opt/coins/nodes/zcash/bin/zcashd -datadir=/opt/coins/data/zcash/backend -conf=/opt/coins/nodes/zcash/zcash.conf -pid=/run/zcashd/zcash.pid # Creates /run/zcashd owned by zcash RuntimeDirectory=zcashd User=zcash Type=forking -PIDFile=/run/zcashd/zec.pid +PIDFile=/run/zcashd/zcash.pid Restart=on-failure # Resource limits diff --git a/contrib/backends/zcash/zec.conf b/contrib/backends/zcash/zcash.conf similarity index 100% rename from contrib/backends/zcash/zec.conf rename to contrib/backends/zcash/zcash.conf diff --git a/contrib/backends/zcash/zec-testnet.conf b/contrib/backends/zcash/zcash_testnet.conf similarity index 100% rename from contrib/backends/zcash/zec-testnet.conf rename to contrib/backends/zcash/zcash_testnet.conf