From fb914eee516906bf984f6c919c6d167f55fb9ced Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 11 May 2018 12:44:19 +0200 Subject: [PATCH 1/6] Changed blockbook's install directories --- build/deb/debian/blockbook-bch-testnet.conffiles | 2 +- build/deb/debian/blockbook-bch-testnet.cron.daily | 2 +- build/deb/debian/blockbook-bch-testnet.dirs | 2 +- build/deb/debian/blockbook-bch-testnet.install | 8 ++++---- build/deb/debian/blockbook-bch-testnet.links | 4 ++-- build/deb/debian/blockbook-bch-testnet.postinst | 2 +- build/deb/debian/blockbook-bch-testnet.service | 4 ++-- build/deb/debian/blockbook-bch.conffiles | 2 +- build/deb/debian/blockbook-bch.cron.daily | 2 +- build/deb/debian/blockbook-bch.dirs | 2 +- build/deb/debian/blockbook-bch.install | 8 ++++---- build/deb/debian/blockbook-bch.links | 4 ++-- build/deb/debian/blockbook-bch.postinst | 2 +- build/deb/debian/blockbook-bch.service | 4 ++-- build/deb/debian/blockbook-btc-testnet.conffiles | 2 +- build/deb/debian/blockbook-btc-testnet.cron.daily | 2 ++ build/deb/debian/blockbook-btc-testnet.dirs | 2 +- build/deb/debian/blockbook-btc-testnet.install | 8 ++++---- build/deb/debian/blockbook-btc-testnet.links | 4 ++-- build/deb/debian/blockbook-btc-testnet.postinst | 2 +- build/deb/debian/blockbook-btc-testnet.service | 4 ++-- build/deb/debian/blockbook-btc.conffiles | 2 +- build/deb/debian/blockbook-btc.dirs | 2 +- build/deb/debian/blockbook-btc.install | 8 ++++---- build/deb/debian/blockbook-btc.links | 4 ++-- build/deb/debian/blockbook-btc.postinst | 2 +- build/deb/debian/blockbook-btc.service | 4 ++-- build/deb/debian/blockbook-zec.conffiles | 2 +- build/deb/debian/blockbook-zec.cron.daily | 2 ++ build/deb/debian/blockbook-zec.dirs | 2 +- build/deb/debian/blockbook-zec.install | 8 ++++---- build/deb/debian/blockbook-zec.links | 4 ++-- build/deb/debian/blockbook-zec.postinst | 2 +- build/deb/debian/blockbook-zec.service | 4 ++-- 34 files changed, 61 insertions(+), 57 deletions(-) create mode 100644 build/deb/debian/blockbook-btc-testnet.cron.daily create mode 100644 build/deb/debian/blockbook-zec.cron.daily diff --git a/build/deb/debian/blockbook-bch-testnet.conffiles b/build/deb/debian/blockbook-bch-testnet.conffiles index 51318941..aaccca4e 100644 --- a/build/deb/debian/blockbook-bch-testnet.conffiles +++ b/build/deb/debian/blockbook-bch-testnet.conffiles @@ -1 +1 @@ -/opt/blockbook/bch-testnet/config/blockchaincfg.json +/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 index 4827959f..b6fa1fa4 100644 --- a/build/deb/debian/blockbook-bch-testnet.cron.daily +++ b/build/deb/debian/blockbook-bch-testnet.cron.daily @@ -1,2 +1,2 @@ #!/bin/sh -find /opt/blockbook/bch-testnet/logs -mtime +6 -type f -delete +find /opt/coins/blockbook/bch-testnet/logs -mtime +6 -type f -delete diff --git a/build/deb/debian/blockbook-bch-testnet.dirs b/build/deb/debian/blockbook-bch-testnet.dirs index c2be0d25..dd5ed626 100644 --- a/build/deb/debian/blockbook-bch-testnet.dirs +++ b/build/deb/debian/blockbook-bch-testnet.dirs @@ -1,2 +1,2 @@ /data/bch-testnet/blockbook -/opt/blockbook/bch-testnet/logs +/opt/coins/blockbook/bch-testnet/logs diff --git a/build/deb/debian/blockbook-bch-testnet.install b/build/deb/debian/blockbook-bch-testnet.install index b145f532..7064acb1 100755 --- a/build/deb/debian/blockbook-bch-testnet.install +++ b/build/deb/debian/blockbook-bch-testnet.install @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec -blockbook /opt/blockbook/bch-testnet/bin -cert /opt/blockbook/bch-testnet -static /opt/blockbook/bch-testnet -configs/bch-testnet.json => /opt/blockbook/bch-testnet/config/blockchaincfg.json +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 diff --git a/build/deb/debian/blockbook-bch-testnet.links b/build/deb/debian/blockbook-bch-testnet.links index a2ffacc3..8e1d05f6 100644 --- a/build/deb/debian/blockbook-bch-testnet.links +++ b/build/deb/debian/blockbook-bch-testnet.links @@ -1,2 +1,2 @@ -/opt/blockbook/bch-testnet/cert/testcert.crt /opt/blockbook/bch-testnet/cert/blockbook.crt -/opt/blockbook/bch-testnet/cert/testcert.key /opt/blockbook/bch-testnet/cert/blockbook.key +/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 index 6e94b440..0d88ff8d 100644 --- a/build/deb/debian/blockbook-bch-testnet.postinst +++ b/build/deb/debian/blockbook-bch-testnet.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/bch-testnet/blockbook /opt/blockbook/bch-testnet/logs + for dir in /data/bch-testnet/blockbook /opt/coins/blockbook/bch-testnet/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-bch-testnet.service b/build/deb/debian/blockbook-bch-testnet.service index 77c98185..53e8f9bb 100644 --- a/build/deb/debian/blockbook-bch-testnet.service +++ b/build/deb/debian/blockbook-bch-testnet.service @@ -9,11 +9,11 @@ Description=Blockbook daemon (BCH testnet) After=network.target [Service] -ExecStart=/opt/blockbook/bch-testnet/bin/blockbook -coin=bch-testnet -blockchaincfg=/opt/blockbook/bch-testnet/config/blockchaincfg.json -datadir=/data/bch-testnet/blockbook/db -sync -httpserver=:18435 -socketio=:18436 -certfile=/opt/blockbook/bch-testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/blockbook/bch-testnet/logs +ExecStart=/opt/coins/blockbook/bch-testnet/bin/blockbook -coin=bch-testnet -blockchaincfg=/opt/coins/blockbook/bch-testnet/config/blockchaincfg.json -datadir=/data/bch-testnet/blockbook/db -sync -httpserver=:18435 -socketio=:18436 -certfile=/opt/coins/blockbook/bch-testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch-testnet/logs User=blockbook Type=simple Restart=on-failure -WorkingDirectory=/opt/blockbook/bch-testnet +WorkingDirectory=/opt/coins/blockbook/bch-testnet # Hardening measures #################### diff --git a/build/deb/debian/blockbook-bch.conffiles b/build/deb/debian/blockbook-bch.conffiles index 7195f6f3..2f6fffc1 100644 --- a/build/deb/debian/blockbook-bch.conffiles +++ b/build/deb/debian/blockbook-bch.conffiles @@ -1 +1 @@ -/opt/blockbook/bch/config/blockchaincfg.json +/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 index f6fc7427..4e77178d 100644 --- a/build/deb/debian/blockbook-bch.cron.daily +++ b/build/deb/debian/blockbook-bch.cron.daily @@ -1,2 +1,2 @@ #!/bin/sh -find /opt/blockbook/bch/logs -mtime +6 -type f -delete +find /opt/coins/blockbook/bch/logs -mtime +6 -type f -delete diff --git a/build/deb/debian/blockbook-bch.dirs b/build/deb/debian/blockbook-bch.dirs index 5f081d6a..acda3c46 100644 --- a/build/deb/debian/blockbook-bch.dirs +++ b/build/deb/debian/blockbook-bch.dirs @@ -1,2 +1,2 @@ /data/bch/blockbook -/opt/blockbook/bch/logs +/opt/coins/blockbook/bch/logs diff --git a/build/deb/debian/blockbook-bch.install b/build/deb/debian/blockbook-bch.install index 33f4a700..2fbc27fa 100755 --- a/build/deb/debian/blockbook-bch.install +++ b/build/deb/debian/blockbook-bch.install @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec -blockbook /opt/blockbook/bch/bin -cert /opt/blockbook/bch -static /opt/blockbook/bch -configs/bch.json => /opt/blockbook/bch/config/blockchaincfg.json +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 diff --git a/build/deb/debian/blockbook-bch.links b/build/deb/debian/blockbook-bch.links index e236a84c..b08a157d 100644 --- a/build/deb/debian/blockbook-bch.links +++ b/build/deb/debian/blockbook-bch.links @@ -1,2 +1,2 @@ -/opt/blockbook/bch/cert/testcert.crt /opt/blockbook/bch/cert/blockbook.crt -/opt/blockbook/bch/cert/testcert.key /opt/blockbook/bch/cert/blockbook.key +/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 index f40d9728..1c04360e 100644 --- a/build/deb/debian/blockbook-bch.postinst +++ b/build/deb/debian/blockbook-bch.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/bch/blockbook /opt/blockbook/bch/logs + for dir in /data/bch/blockbook /opt/coins/blockbook/bch/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-bch.service b/build/deb/debian/blockbook-bch.service index c17df6ed..8a0d6878 100644 --- a/build/deb/debian/blockbook-bch.service +++ b/build/deb/debian/blockbook-bch.service @@ -9,11 +9,11 @@ Description=Blockbook daemon (BCH mainnet) After=network.target [Service] -ExecStart=/opt/blockbook/bch/bin/blockbook -coin=bch -blockchaincfg=/opt/blockbook/bch/config/blockchaincfg.json -datadir=/data/bch/blockbook/db -sync -httpserver=:8435 -socketio=:8436 -certfile=/opt/blockbook/bch/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/blockbook/bch/logs +ExecStart=/opt/coins/blockbook/bch/bin/blockbook -coin=bch -blockchaincfg=/opt/coins/blockbook/bch/config/blockchaincfg.json -datadir=/data/bch/blockbook/db -sync -httpserver=:8435 -socketio=:8436 -certfile=/opt/coins/blockbook/bch/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch/logs User=blockbook Type=simple Restart=on-failure -WorkingDirectory=/opt/blockbook/bch +WorkingDirectory=/opt/coins/blockbook/bch # Hardening measures #################### diff --git a/build/deb/debian/blockbook-btc-testnet.conffiles b/build/deb/debian/blockbook-btc-testnet.conffiles index 354f62ae..b7e2930b 100644 --- a/build/deb/debian/blockbook-btc-testnet.conffiles +++ b/build/deb/debian/blockbook-btc-testnet.conffiles @@ -1 +1 @@ -/opt/blockbook/btc-testnet/config/blockchaincfg.json +/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 new file mode 100644 index 00000000..11b1a8b0 --- /dev/null +++ b/build/deb/debian/blockbook-btc-testnet.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +find /opt/coins/blockbook/btc-testnet/logs -mtime +6 -type f -delete diff --git a/build/deb/debian/blockbook-btc-testnet.dirs b/build/deb/debian/blockbook-btc-testnet.dirs index e1d51287..34d484e6 100644 --- a/build/deb/debian/blockbook-btc-testnet.dirs +++ b/build/deb/debian/blockbook-btc-testnet.dirs @@ -1,2 +1,2 @@ /data/btc-testnet/blockbook -/opt/blockbook/btc-testnet/logs +/opt/coins/blockbook/btc-testnet/logs diff --git a/build/deb/debian/blockbook-btc-testnet.install b/build/deb/debian/blockbook-btc-testnet.install index e648ad35..26629f64 100755 --- a/build/deb/debian/blockbook-btc-testnet.install +++ b/build/deb/debian/blockbook-btc-testnet.install @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec -blockbook /opt/blockbook/btc-testnet/bin -cert /opt/blockbook/btc-testnet -static /opt/blockbook/btc-testnet -configs/btc-testnet.json => /opt/blockbook/btc-testnet/config/blockchaincfg.json +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 diff --git a/build/deb/debian/blockbook-btc-testnet.links b/build/deb/debian/blockbook-btc-testnet.links index d8166b72..6bf90efe 100644 --- a/build/deb/debian/blockbook-btc-testnet.links +++ b/build/deb/debian/blockbook-btc-testnet.links @@ -1,2 +1,2 @@ -/opt/blockbook/btc-testnet/cert/testcert.crt /opt/blockbook/btc-testnet/cert/blockbook.crt -/opt/blockbook/btc-testnet/cert/testcert.key /opt/blockbook/btc-testnet/cert/blockbook.key +/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 index f7bfccbc..20d94c5b 100644 --- a/build/deb/debian/blockbook-btc-testnet.postinst +++ b/build/deb/debian/blockbook-btc-testnet.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/btc-testnet/blockbook /opt/blockbook/btc-testnet/logs + for dir in /data/btc-testnet/blockbook /opt/coins/blockbook/btc-testnet/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-btc-testnet.service b/build/deb/debian/blockbook-btc-testnet.service index 38fa52ad..249f1567 100644 --- a/build/deb/debian/blockbook-btc-testnet.service +++ b/build/deb/debian/blockbook-btc-testnet.service @@ -9,11 +9,11 @@ Description=Blockbook daemon (BTC testnet) After=network.target [Service] -ExecStart=/opt/blockbook/btc-testnet/bin/blockbook -coin=btc-testnet -blockchaincfg=/opt/blockbook/btc-testnet/config/blockchaincfg.json -datadir=/data/btc-testnet/blockbook/db -sync -httpserver=:18335 -socketio=:18336 -certfile=/opt/blockbook/btc-testnet/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/blockbook/btc-testnet/logs +ExecStart=/opt/coins/blockbook/btc-testnet/bin/blockbook -coin=btc-testnet -blockchaincfg=/opt/coins/blockbook/btc-testnet/config/blockchaincfg.json -datadir=/data/btc-testnet/blockbook/db -sync -httpserver=:18335 -socketio=:18336 -certfile=/opt/coins/blockbook/btc-testnet/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc-testnet/logs User=blockbook Type=simple Restart=on-failure -WorkingDirectory=/opt/blockbook/btc-testnet +WorkingDirectory=/opt/coins/blockbook/btc-testnet # Hardening measures #################### diff --git a/build/deb/debian/blockbook-btc.conffiles b/build/deb/debian/blockbook-btc.conffiles index 1714ce0f..9fe092c2 100644 --- a/build/deb/debian/blockbook-btc.conffiles +++ b/build/deb/debian/blockbook-btc.conffiles @@ -1 +1 @@ -/opt/blockbook/btc/config/blockchaincfg.json +/opt/coins/blockbook/btc/config/blockchaincfg.json diff --git a/build/deb/debian/blockbook-btc.dirs b/build/deb/debian/blockbook-btc.dirs index 907b5d84..766a21e4 100644 --- a/build/deb/debian/blockbook-btc.dirs +++ b/build/deb/debian/blockbook-btc.dirs @@ -1,2 +1,2 @@ /data/btc/blockbook -/opt/blockbook/btc/logs +/opt/coins/blockbook/btc/logs diff --git a/build/deb/debian/blockbook-btc.install b/build/deb/debian/blockbook-btc.install index 27a11fc0..945b78cc 100755 --- a/build/deb/debian/blockbook-btc.install +++ b/build/deb/debian/blockbook-btc.install @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec -blockbook /opt/blockbook/btc/bin -cert /opt/blockbook/btc -static /opt/blockbook/btc -configs/btc.json => /opt/blockbook/btc/config/blockchaincfg.json +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 diff --git a/build/deb/debian/blockbook-btc.links b/build/deb/debian/blockbook-btc.links index 519988cb..71e45b5e 100644 --- a/build/deb/debian/blockbook-btc.links +++ b/build/deb/debian/blockbook-btc.links @@ -1,2 +1,2 @@ -/opt/blockbook/btc/cert/testcert.crt /opt/blockbook/btc/cert/blockbook.crt -/opt/blockbook/btc/cert/testcert.key /opt/blockbook/btc/cert/blockbook.key +/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 index 29b2c0fd..48c5481d 100644 --- a/build/deb/debian/blockbook-btc.postinst +++ b/build/deb/debian/blockbook-btc.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/btc/blockbook /opt/blockbook/btc/logs + for dir in /data/btc/blockbook /opt/coins/blockbook/btc/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-btc.service b/build/deb/debian/blockbook-btc.service index 4eaad785..b027c527 100644 --- a/build/deb/debian/blockbook-btc.service +++ b/build/deb/debian/blockbook-btc.service @@ -9,11 +9,11 @@ Description=Blockbook daemon (BTC mainnet) After=network.target [Service] -ExecStart=/opt/blockbook/btc/bin/blockbook -coin=btc -blockchaincfg=/opt/blockbook/btc/config/blockchaincfg.json -datadir=/data/btc/blockbook/db -sync -httpserver=:8335 -socketio=:8336 -certfile=/opt/blockbook/btc/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/blockbook/btc/logs +ExecStart=/opt/coins/blockbook/btc/bin/blockbook -coin=btc -blockchaincfg=/opt/coins/blockbook/btc/config/blockchaincfg.json -datadir=/data/btc/blockbook/db -sync -httpserver=:8335 -socketio=:8336 -certfile=/opt/coins/blockbook/btc/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc/logs User=blockbook Type=simple Restart=on-failure -WorkingDirectory=/opt/blockbook/btc +WorkingDirectory=/opt/coins/blockbook/btc # Hardening measures #################### diff --git a/build/deb/debian/blockbook-zec.conffiles b/build/deb/debian/blockbook-zec.conffiles index d3e9eb1c..fbf05888 100644 --- a/build/deb/debian/blockbook-zec.conffiles +++ b/build/deb/debian/blockbook-zec.conffiles @@ -1 +1 @@ -/opt/blockbook/zec/config/blockchaincfg.json +/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 new file mode 100644 index 00000000..cd04a1dc --- /dev/null +++ b/build/deb/debian/blockbook-zec.cron.daily @@ -0,0 +1,2 @@ +#!/bin/sh +find /opt/coins/blockbook/zec/logs -mtime +6 -type f -delete diff --git a/build/deb/debian/blockbook-zec.dirs b/build/deb/debian/blockbook-zec.dirs index 6d0f5523..7dee46fc 100644 --- a/build/deb/debian/blockbook-zec.dirs +++ b/build/deb/debian/blockbook-zec.dirs @@ -1,2 +1,2 @@ /data/zec/blockbook -/opt/blockbook/zec/logs +/opt/coins/blockbook/zec/logs diff --git a/build/deb/debian/blockbook-zec.install b/build/deb/debian/blockbook-zec.install index caf66e51..6f09dd98 100755 --- a/build/deb/debian/blockbook-zec.install +++ b/build/deb/debian/blockbook-zec.install @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec --with=install -blockbook /opt/blockbook/zec/bin -cert /opt/blockbook/zec -static /opt/blockbook/zec -configs/zec.json => /opt/blockbook/zec/config/blockchaincfg.json +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 diff --git a/build/deb/debian/blockbook-zec.links b/build/deb/debian/blockbook-zec.links index 251168f7..083005f8 100644 --- a/build/deb/debian/blockbook-zec.links +++ b/build/deb/debian/blockbook-zec.links @@ -1,2 +1,2 @@ -/opt/blockbook/zec/cert/testcert.crt /opt/blockbook/zec/cert/blockbook.crt -/opt/blockbook/zec/cert/testcert.key /opt/blockbook/zec/cert/blockbook.key +/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 index 271b4603..e1041075 100644 --- a/build/deb/debian/blockbook-zec.postinst +++ b/build/deb/debian/blockbook-zec.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/zec/blockbook /opt/blockbook/zec/logs + for dir in /data/zec/blockbook /opt/coins/blockbook/zec/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-zec.service b/build/deb/debian/blockbook-zec.service index 9db3aed7..544ff1d9 100644 --- a/build/deb/debian/blockbook-zec.service +++ b/build/deb/debian/blockbook-zec.service @@ -9,11 +9,11 @@ Description=Blockbook daemon (ZEC mainnet) After=network.target [Service] -ExecStart=/opt/blockbook/zec/bin/blockbook -coin=zec -blockchaincfg=/opt/blockbook/zec/config/blockchaincfg.json -datadir=/data/zec/blockbook/db -sync -httpserver=:8235 -socketio=:8236 -certfile=/opt/blockbook/zec/cert/blockbook -explorer=https://zec-bitcore1.trezor.io/ -log_dir=/opt/blockbook/zec/logs +ExecStart=/opt/coins/blockbook/zec/bin/blockbook -coin=zec -blockchaincfg=/opt/coins/blockbook/zec/config/blockchaincfg.json -datadir=/data/zec/blockbook/db -sync -httpserver=:8235 -socketio=:8236 -certfile=/opt/coins/blockbook/zec/cert/blockbook -explorer=https://zec-bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/zec/logs User=blockbook Type=simple Restart=on-failure -WorkingDirectory=/opt/blockbook/zec +WorkingDirectory=/opt/coins/blockbook/zec # Hardening measures #################### From b8d23f3e1e45f55b0a43510d19c7914b615a588d Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 11 May 2018 12:53:53 +0200 Subject: [PATCH 2/6] Changed blockbook's data directories --- build/deb/debian/blockbook-bch-testnet.dirs | 2 +- build/deb/debian/blockbook-bch-testnet.postinst | 2 +- build/deb/debian/blockbook-bch-testnet.service | 2 +- build/deb/debian/blockbook-bch.dirs | 2 +- build/deb/debian/blockbook-bch.postinst | 2 +- build/deb/debian/blockbook-bch.service | 2 +- build/deb/debian/blockbook-btc-testnet.dirs | 2 +- build/deb/debian/blockbook-btc-testnet.postinst | 2 +- build/deb/debian/blockbook-btc-testnet.service | 2 +- build/deb/debian/blockbook-btc.dirs | 2 +- build/deb/debian/blockbook-btc.postinst | 2 +- build/deb/debian/blockbook-btc.service | 2 +- build/deb/debian/blockbook-zec.dirs | 2 +- build/deb/debian/blockbook-zec.postinst | 2 +- build/deb/debian/blockbook-zec.service | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/deb/debian/blockbook-bch-testnet.dirs b/build/deb/debian/blockbook-bch-testnet.dirs index dd5ed626..a6f4d16e 100644 --- a/build/deb/debian/blockbook-bch-testnet.dirs +++ b/build/deb/debian/blockbook-bch-testnet.dirs @@ -1,2 +1,2 @@ -/data/bch-testnet/blockbook +/opt/coins/data/bch-testnet/blockbook /opt/coins/blockbook/bch-testnet/logs diff --git a/build/deb/debian/blockbook-bch-testnet.postinst b/build/deb/debian/blockbook-bch-testnet.postinst index 0d88ff8d..fb10d866 100644 --- a/build/deb/debian/blockbook-bch-testnet.postinst +++ b/build/deb/debian/blockbook-bch-testnet.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/bch-testnet/blockbook /opt/coins/blockbook/bch-testnet/logs + for dir in /opt/coins/data/bch-testnet/blockbook /opt/coins/blockbook/bch-testnet/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-bch-testnet.service b/build/deb/debian/blockbook-bch-testnet.service index 53e8f9bb..b142cfa8 100644 --- a/build/deb/debian/blockbook-bch-testnet.service +++ b/build/deb/debian/blockbook-bch-testnet.service @@ -9,7 +9,7 @@ Description=Blockbook daemon (BCH testnet) After=network.target [Service] -ExecStart=/opt/coins/blockbook/bch-testnet/bin/blockbook -coin=bch-testnet -blockchaincfg=/opt/coins/blockbook/bch-testnet/config/blockchaincfg.json -datadir=/data/bch-testnet/blockbook/db -sync -httpserver=:18435 -socketio=:18436 -certfile=/opt/coins/blockbook/bch-testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch-testnet/logs +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=:18435 -socketio=:18436 -certfile=/opt/coins/blockbook/bch-testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch-testnet/logs User=blockbook Type=simple Restart=on-failure diff --git a/build/deb/debian/blockbook-bch.dirs b/build/deb/debian/blockbook-bch.dirs index acda3c46..34b594ad 100644 --- a/build/deb/debian/blockbook-bch.dirs +++ b/build/deb/debian/blockbook-bch.dirs @@ -1,2 +1,2 @@ -/data/bch/blockbook +/opt/coins/data/bch/blockbook /opt/coins/blockbook/bch/logs diff --git a/build/deb/debian/blockbook-bch.postinst b/build/deb/debian/blockbook-bch.postinst index 1c04360e..2b42e29f 100644 --- a/build/deb/debian/blockbook-bch.postinst +++ b/build/deb/debian/blockbook-bch.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/bch/blockbook /opt/coins/blockbook/bch/logs + for dir in /opt/coins/data/bch/blockbook /opt/coins/blockbook/bch/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-bch.service b/build/deb/debian/blockbook-bch.service index 8a0d6878..dc5fa0fa 100644 --- a/build/deb/debian/blockbook-bch.service +++ b/build/deb/debian/blockbook-bch.service @@ -9,7 +9,7 @@ Description=Blockbook daemon (BCH mainnet) After=network.target [Service] -ExecStart=/opt/coins/blockbook/bch/bin/blockbook -coin=bch -blockchaincfg=/opt/coins/blockbook/bch/config/blockchaincfg.json -datadir=/data/bch/blockbook/db -sync -httpserver=:8435 -socketio=:8436 -certfile=/opt/coins/blockbook/bch/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch/logs +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=:8435 -socketio=:8436 -certfile=/opt/coins/blockbook/bch/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch/logs User=blockbook Type=simple Restart=on-failure diff --git a/build/deb/debian/blockbook-btc-testnet.dirs b/build/deb/debian/blockbook-btc-testnet.dirs index 34d484e6..04a70a52 100644 --- a/build/deb/debian/blockbook-btc-testnet.dirs +++ b/build/deb/debian/blockbook-btc-testnet.dirs @@ -1,2 +1,2 @@ -/data/btc-testnet/blockbook +/opt/coins/data/btc-testnet/blockbook /opt/coins/blockbook/btc-testnet/logs diff --git a/build/deb/debian/blockbook-btc-testnet.postinst b/build/deb/debian/blockbook-btc-testnet.postinst index 20d94c5b..5f415e5d 100644 --- a/build/deb/debian/blockbook-btc-testnet.postinst +++ b/build/deb/debian/blockbook-btc-testnet.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/btc-testnet/blockbook /opt/coins/blockbook/btc-testnet/logs + for dir in /opt/coins/data/btc-testnet/blockbook /opt/coins/blockbook/btc-testnet/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-btc-testnet.service b/build/deb/debian/blockbook-btc-testnet.service index 249f1567..9eea273a 100644 --- a/build/deb/debian/blockbook-btc-testnet.service +++ b/build/deb/debian/blockbook-btc-testnet.service @@ -9,7 +9,7 @@ Description=Blockbook daemon (BTC testnet) After=network.target [Service] -ExecStart=/opt/coins/blockbook/btc-testnet/bin/blockbook -coin=btc-testnet -blockchaincfg=/opt/coins/blockbook/btc-testnet/config/blockchaincfg.json -datadir=/data/btc-testnet/blockbook/db -sync -httpserver=:18335 -socketio=:18336 -certfile=/opt/coins/blockbook/btc-testnet/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc-testnet/logs +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=:18335 -socketio=:18336 -certfile=/opt/coins/blockbook/btc-testnet/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc-testnet/logs User=blockbook Type=simple Restart=on-failure diff --git a/build/deb/debian/blockbook-btc.dirs b/build/deb/debian/blockbook-btc.dirs index 766a21e4..55205d1e 100644 --- a/build/deb/debian/blockbook-btc.dirs +++ b/build/deb/debian/blockbook-btc.dirs @@ -1,2 +1,2 @@ -/data/btc/blockbook +/opt/coins/data/btc/blockbook /opt/coins/blockbook/btc/logs diff --git a/build/deb/debian/blockbook-btc.postinst b/build/deb/debian/blockbook-btc.postinst index 48c5481d..9b4d0324 100644 --- a/build/deb/debian/blockbook-btc.postinst +++ b/build/deb/debian/blockbook-btc.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/btc/blockbook /opt/coins/blockbook/btc/logs + for dir in /opt/coins/data/btc/blockbook /opt/coins/blockbook/btc/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-btc.service b/build/deb/debian/blockbook-btc.service index b027c527..4bd5f704 100644 --- a/build/deb/debian/blockbook-btc.service +++ b/build/deb/debian/blockbook-btc.service @@ -9,7 +9,7 @@ Description=Blockbook daemon (BTC mainnet) After=network.target [Service] -ExecStart=/opt/coins/blockbook/btc/bin/blockbook -coin=btc -blockchaincfg=/opt/coins/blockbook/btc/config/blockchaincfg.json -datadir=/data/btc/blockbook/db -sync -httpserver=:8335 -socketio=:8336 -certfile=/opt/coins/blockbook/btc/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc/logs +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=:8335 -socketio=:8336 -certfile=/opt/coins/blockbook/btc/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc/logs User=blockbook Type=simple Restart=on-failure diff --git a/build/deb/debian/blockbook-zec.dirs b/build/deb/debian/blockbook-zec.dirs index 7dee46fc..5dc7b52f 100644 --- a/build/deb/debian/blockbook-zec.dirs +++ b/build/deb/debian/blockbook-zec.dirs @@ -1,2 +1,2 @@ -/data/zec/blockbook +/opt/coins/data/zec/blockbook /opt/coins/blockbook/zec/logs diff --git a/build/deb/debian/blockbook-zec.postinst b/build/deb/debian/blockbook-zec.postinst index e1041075..b0a04213 100644 --- a/build/deb/debian/blockbook-zec.postinst +++ b/build/deb/debian/blockbook-zec.postinst @@ -9,7 +9,7 @@ case "$1" in useradd --system -M -U blockbook fi - for dir in /data/zec/blockbook /opt/coins/blockbook/zec/logs + for dir in /opt/coins/data/zec/blockbook /opt/coins/blockbook/zec/logs do if [ "$(stat -c '%U' $dir)" != "blockbook" ] then diff --git a/build/deb/debian/blockbook-zec.service b/build/deb/debian/blockbook-zec.service index 544ff1d9..8dd87fc9 100644 --- a/build/deb/debian/blockbook-zec.service +++ b/build/deb/debian/blockbook-zec.service @@ -9,7 +9,7 @@ Description=Blockbook daemon (ZEC mainnet) After=network.target [Service] -ExecStart=/opt/coins/blockbook/zec/bin/blockbook -coin=zec -blockchaincfg=/opt/coins/blockbook/zec/config/blockchaincfg.json -datadir=/data/zec/blockbook/db -sync -httpserver=:8235 -socketio=:8236 -certfile=/opt/coins/blockbook/zec/cert/blockbook -explorer=https://zec-bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/zec/logs +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=:8235 -socketio=:8236 -certfile=/opt/coins/blockbook/zec/cert/blockbook -explorer=https://zec-bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/zec/logs User=blockbook Type=simple Restart=on-failure From ab2a1a6f486bed92f56b2ff8cdb43d8187b2f57d Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 11 May 2018 13:24:32 +0200 Subject: [PATCH 3/6] Changed backends' data directories --- contrib/backends/bcash/debian/bcash-bch.dirs | 2 +- contrib/backends/bcash/debian/bcash-bch.logrotate | 4 ++-- contrib/backends/bcash/debian/bcash-bch.postinst | 4 ++-- contrib/backends/bcash/debian/bcash-bch.service | 2 +- contrib/backends/bcash/debian/bcash-testnet.dirs | 2 +- contrib/backends/bcash/debian/bcash-testnet.logrotate | 4 ++-- contrib/backends/bcash/debian/bcash-testnet.postinst | 4 ++-- contrib/backends/bcash/debian/bcash-testnet.service | 2 +- contrib/backends/bitcoin/debian/bitcoin-btc.dirs | 2 +- contrib/backends/bitcoin/debian/bitcoin-btc.logrotate | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-btc.postinst | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-btc.service | 2 +- contrib/backends/bitcoin/debian/bitcoin-testnet.dirs | 2 +- contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-testnet.postinst | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-testnet.service | 2 +- contrib/backends/zcash/debian/zcash-zec.dirs | 2 +- contrib/backends/zcash/debian/zcash-zec.logrotate | 4 ++-- contrib/backends/zcash/debian/zcash-zec.postinst | 6 +++--- contrib/backends/zcash/debian/zcash-zec.service | 4 ++-- 20 files changed, 32 insertions(+), 32 deletions(-) diff --git a/contrib/backends/bcash/debian/bcash-bch.dirs b/contrib/backends/bcash/debian/bcash-bch.dirs index ad156456..b5baf026 100644 --- a/contrib/backends/bcash/debian/bcash-bch.dirs +++ b/contrib/backends/bcash/debian/bcash-bch.dirs @@ -1 +1 @@ -/data/bch/bitcoin +/opt/coins/data/bch/bitcoin diff --git a/contrib/backends/bcash/debian/bcash-bch.logrotate b/contrib/backends/bcash/debian/bcash-bch.logrotate index 130eb1dc..9b267719 100644 --- a/contrib/backends/bcash/debian/bcash-bch.logrotate +++ b/contrib/backends/bcash/debian/bcash-bch.logrotate @@ -1,5 +1,5 @@ -/data/bch/bitcoin/debug.log -/data/bch/bitcoin/db.log +/opt/coins/data/bch/bitcoin/debug.log +/opt/coins/data/bch/bitcoin/db.log { rotate 7 daily diff --git a/contrib/backends/bcash/debian/bcash-bch.postinst b/contrib/backends/bcash/debian/bcash-bch.postinst index bea81f65..ebe53305 100644 --- a/contrib/backends/bcash/debian/bcash-bch.postinst +++ b/contrib/backends/bcash/debian/bcash-bch.postinst @@ -9,9 +9,9 @@ case "$1" in useradd --system -M -U bitcoin fi - if [ "$(stat -c '%U' /data/bch/bitcoin)" != "bitcoin" ] + if [ "$(stat -c '%U' /opt/coins/data/bch/bitcoin)" != "bitcoin" ] then - chown bitcoin:bitcoin /data/bch/bitcoin + chown bitcoin:bitcoin /opt/coins/data/bch/bitcoin fi ;; diff --git a/contrib/backends/bcash/debian/bcash-bch.service b/contrib/backends/bcash/debian/bcash-bch.service index 298e0d97..becf0d83 100644 --- a/contrib/backends/bcash/debian/bcash-bch.service +++ b/contrib/backends/bcash/debian/bcash-bch.service @@ -12,7 +12,7 @@ Description=Bitcoin Cash daemon (mainnet) After=network.target [Service] -ExecStart=/opt/bitcoin/bch/bin/bitcoind -datadir=/data/bch/bitcoin -conf=/opt/bitcoin/bch/bch.conf -pid=/run/bitcoind/bch.pid +ExecStart=/opt/bitcoin/bch/bin/bitcoind -datadir=/opt/coins/data/bch/bitcoin -conf=/opt/bitcoin/bch/bch.conf -pid=/run/bitcoind/bch.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/bcash/debian/bcash-testnet.dirs b/contrib/backends/bcash/debian/bcash-testnet.dirs index 86472a15..d5a2c725 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.dirs +++ b/contrib/backends/bcash/debian/bcash-testnet.dirs @@ -1 +1 @@ -/data/bch-testnet/bitcoin +/opt/coins/data/bch-testnet/bitcoin diff --git a/contrib/backends/bcash/debian/bcash-testnet.logrotate b/contrib/backends/bcash/debian/bcash-testnet.logrotate index d009963f..766fbf06 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.logrotate +++ b/contrib/backends/bcash/debian/bcash-testnet.logrotate @@ -1,5 +1,5 @@ -/data/bch-testnet/bitcoin/testnet3/debug.log -/data/bch-testnet/bitcoin/testnet3/db.log +/opt/coins/data/bch-testnet/bitcoin/testnet3/debug.log +/opt/coins/data/bch-testnet/bitcoin/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 33dec1ef..291f74a4 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 bitcoin fi - if [ "$(stat -c '%U' /data/bch-testnet/bitcoin)" != "bitcoin" ] + if [ "$(stat -c '%U' /opt/coins/data/bch-testnet/bitcoin)" != "bitcoin" ] then - chown bitcoin:bitcoin /data/bch-testnet/bitcoin + chown bitcoin:bitcoin /opt/coins/data/bch-testnet/bitcoin fi ;; diff --git a/contrib/backends/bcash/debian/bcash-testnet.service b/contrib/backends/bcash/debian/bcash-testnet.service index 56d8fc31..0c820b6c 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.service +++ b/contrib/backends/bcash/debian/bcash-testnet.service @@ -12,7 +12,7 @@ Description=Bitcoin Cash daemon (testnet) After=network.target [Service] -ExecStart=/opt/bitcoin/bch-testnet/bin/bitcoind -datadir=/data/bch-testnet/bitcoin -conf=/opt/bitcoin/bch-testnet/bch-testnet.conf -pid=/run/bitcoind/bch-testnet.pid +ExecStart=/opt/bitcoin/bch-testnet/bin/bitcoind -datadir=/opt/coins/data/bch-testnet/bitcoin -conf=/opt/bitcoin/bch-testnet/bch-testnet.conf -pid=/run/bitcoind/bch-testnet.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.dirs b/contrib/backends/bitcoin/debian/bitcoin-btc.dirs index 4195abd8..5ee2039f 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.dirs +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.dirs @@ -1 +1 @@ -/data/btc/bitcoin +/opt/coins/data/btc/bitcoin diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.logrotate b/contrib/backends/bitcoin/debian/bitcoin-btc.logrotate index 9f8bd435..0b571179 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.logrotate +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.logrotate @@ -1,5 +1,5 @@ -/data/btc/bitcoin/debug.log -/data/btc/bitcoin/db.log +/opt/coins/data/btc/bitcoin/debug.log +/opt/coins/data/btc/bitcoin/db.log { rotate 7 daily diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.postinst b/contrib/backends/bitcoin/debian/bitcoin-btc.postinst index e22a02e6..17317f8b 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.postinst +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.postinst @@ -9,9 +9,9 @@ case "$1" in useradd --system -M -U bitcoin fi - if [ "$(stat -c '%U' /data/btc/bitcoin)" != "bitcoin" ] + if [ "$(stat -c '%U' /opt/coins/data/btc/bitcoin)" != "bitcoin" ] then - chown bitcoin:bitcoin /data/btc/bitcoin + chown bitcoin:bitcoin /opt/coins/data/btc/bitcoin fi ;; diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.service b/contrib/backends/bitcoin/debian/bitcoin-btc.service index 25f02d8e..1bf91620 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.service +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.service @@ -12,7 +12,7 @@ Description=Bitcoin daemon (mainnet) After=network.target [Service] -ExecStart=/opt/bitcoin/btc/bin/bitcoind -datadir=/data/btc/bitcoin -conf=/opt/bitcoin/btc/btc.conf -pid=/run/bitcoind/btc.pid +ExecStart=/opt/bitcoin/btc/bin/bitcoind -datadir=/opt/coins/data/btc/bitcoin -conf=/opt/bitcoin/btc/btc.conf -pid=/run/bitcoind/btc.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs b/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs index 26b686f8..d15c0af3 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs @@ -1 +1 @@ -/data/btc-testnet/bitcoin +/opt/coins/data/btc-testnet/bitcoin diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate b/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate index f718ec24..ebe95e6f 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate @@ -1,5 +1,5 @@ -/data/btc-testnet/bitcoin/testnet3/debug.log -/data/btc-testnet/bitcoin/testnet3/db.log +/opt/coins/data/btc-testnet/bitcoin/testnet3/debug.log +/opt/coins/data/btc-testnet/bitcoin/testnet3/db.log { rotate 7 daily diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst b/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst index ebadd9ae..757eb71e 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst @@ -9,9 +9,9 @@ case "$1" in useradd --system -M -U bitcoin fi - if [ "$(stat -c '%U' /data/btc-testnet/bitcoin)" != "bitcoin" ] + if [ "$(stat -c '%U' /opt/coins/data/btc-testnet/bitcoin)" != "bitcoin" ] then - chown bitcoin:bitcoin /data/btc-testnet/bitcoin + chown bitcoin:bitcoin /opt/coins/data/btc-testnet/bitcoin fi ;; diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.service b/contrib/backends/bitcoin/debian/bitcoin-testnet.service index 431fe84d..162017a4 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.service +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.service @@ -12,7 +12,7 @@ Description=Bitcoin daemon (testnet) After=network.target [Service] -ExecStart=/opt/bitcoin/btc-testnet/bin/bitcoind -datadir=/data/btc-testnet/bitcoin -conf=/opt/bitcoin/btc-testnet/btc-testnet.conf -pid=/run/bitcoind/testnet.pid +ExecStart=/opt/bitcoin/btc-testnet/bin/bitcoind -datadir=/opt/coins/data/btc-testnet/bitcoin -conf=/opt/bitcoin/btc-testnet/btc-testnet.conf -pid=/run/bitcoind/testnet.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/zcash/debian/zcash-zec.dirs b/contrib/backends/zcash/debian/zcash-zec.dirs index 5f8be1f2..f5d02e20 100644 --- a/contrib/backends/zcash/debian/zcash-zec.dirs +++ b/contrib/backends/zcash/debian/zcash-zec.dirs @@ -1 +1 @@ -/data/zec/zcash +/opt/coins/data/zec/zcash diff --git a/contrib/backends/zcash/debian/zcash-zec.logrotate b/contrib/backends/zcash/debian/zcash-zec.logrotate index 536cdeab..ce704abb 100644 --- a/contrib/backends/zcash/debian/zcash-zec.logrotate +++ b/contrib/backends/zcash/debian/zcash-zec.logrotate @@ -1,5 +1,5 @@ -/data/zec/zcash/debug.log -/data/zec/zcash/db.log +/opt/coins/data/zec/zcash/debug.log +/opt/coins/data/zec/zcash/db.log { rotate 7 daily diff --git a/contrib/backends/zcash/debian/zcash-zec.postinst b/contrib/backends/zcash/debian/zcash-zec.postinst index 4ca85d19..17102469 100644 --- a/contrib/backends/zcash/debian/zcash-zec.postinst +++ b/contrib/backends/zcash/debian/zcash-zec.postinst @@ -9,12 +9,12 @@ case "$1" in useradd --system -M -U zcash fi - if [ "$(stat -c '%U' /data/zec/zcash)" != "zcash" ] + if [ "$(stat -c '%U' /opt/coins/data/zec/zcash)" != "zcash" ] then - chown zcash:zcash /data/zec/zcash + chown zcash:zcash /opt/coins/data/zec/zcash fi - HOME=/data/zec/zcash /opt/zcash/zec/bin/zcash-fetch-params + HOME=/opt/coins/data/zec/zcash /opt/zcash/zec/bin/zcash-fetch-params ;; esac diff --git a/contrib/backends/zcash/debian/zcash-zec.service b/contrib/backends/zcash/debian/zcash-zec.service index a232480d..20edb965 100644 --- a/contrib/backends/zcash/debian/zcash-zec.service +++ b/contrib/backends/zcash/debian/zcash-zec.service @@ -12,8 +12,8 @@ Description=ZCash daemon (mainnet) After=network.target [Service] -Environment="HOME=/data/zec/zcash" -ExecStart=/opt/zcash/zec/bin/zcashd -datadir=/data/zec/zcash -conf=/opt/zcash/zec/zec.conf -pid=/run/zcashd/zec.pid +Environment="HOME=/opt/coins/data/zec/zcash" +ExecStart=/opt/zcash/zec/bin/zcashd -datadir=/opt/coins/data/zec/zcash -conf=/opt/zcash/zec/zec.conf -pid=/run/zcashd/zec.pid # Creates /run/zcashd owned by zcash RuntimeDirectory=zcashd User=zcash From b763f1636141cc391414ac99a0ad1b8def7cad1a Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 11 May 2018 13:35:32 +0200 Subject: [PATCH 4/6] Changed backends' install directories --- contrib/backends/bcash/debian/bcash-bch.conffiles | 2 +- contrib/backends/bcash/debian/bcash-bch.install | 4 ++-- contrib/backends/bcash/debian/bcash-bch.service | 4 ++-- contrib/backends/bcash/debian/bcash-testnet.conffiles | 2 +- contrib/backends/bcash/debian/bcash-testnet.install | 4 ++-- contrib/backends/bcash/debian/bcash-testnet.service | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-btc.conffiles | 2 +- contrib/backends/bitcoin/debian/bitcoin-btc.install | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-btc.service | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles | 2 +- contrib/backends/bitcoin/debian/bitcoin-testnet.install | 4 ++-- contrib/backends/bitcoin/debian/bitcoin-testnet.service | 4 ++-- contrib/backends/zcash/debian/zcash-zec.conffiles | 2 +- contrib/backends/zcash/debian/zcash-zec.install | 4 ++-- contrib/backends/zcash/debian/zcash-zec.postinst | 2 +- contrib/backends/zcash/debian/zcash-zec.service | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/contrib/backends/bcash/debian/bcash-bch.conffiles b/contrib/backends/bcash/debian/bcash-bch.conffiles index e8931283..39ff192f 100644 --- a/contrib/backends/bcash/debian/bcash-bch.conffiles +++ b/contrib/backends/bcash/debian/bcash-bch.conffiles @@ -1 +1 @@ -/opt/bitcoin/bch/bch.conf +/opt/coins/nodes/bitcoin-abc/bch/bch.conf diff --git a/contrib/backends/bcash/debian/bcash-bch.install b/contrib/backends/bcash/debian/bcash-bch.install index c002ed3e..89f8005f 100644 --- a/contrib/backends/bcash/debian/bcash-bch.install +++ b/contrib/backends/bcash/debian/bcash-bch.install @@ -1,2 +1,2 @@ -bitcoin-abc/* /opt/bitcoin/bch -bch.conf /opt/bitcoin/bch +bitcoin-abc/* /opt/coins/nodes/bitcoin-abc/bch +bch.conf /opt/coins/nodes/bitcoin-abc/bch diff --git a/contrib/backends/bcash/debian/bcash-bch.service b/contrib/backends/bcash/debian/bcash-bch.service index becf0d83..7f6a4700 100644 --- a/contrib/backends/bcash/debian/bcash-bch.service +++ b/contrib/backends/bcash/debian/bcash-bch.service @@ -5,14 +5,14 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/bitcoin/bch/bch.conf +# /opt/coins/nodes/bitcoin-abc/bch/bch.conf [Unit] Description=Bitcoin Cash daemon (mainnet) After=network.target [Service] -ExecStart=/opt/bitcoin/bch/bin/bitcoind -datadir=/opt/coins/data/bch/bitcoin -conf=/opt/bitcoin/bch/bch.conf -pid=/run/bitcoind/bch.pid +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/bitcoind/bch.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/bcash/debian/bcash-testnet.conffiles b/contrib/backends/bcash/debian/bcash-testnet.conffiles index a1304926..24b971a5 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.conffiles +++ b/contrib/backends/bcash/debian/bcash-testnet.conffiles @@ -1 +1 @@ -/opt/bitcoin/bch-testnet/bch-testnet.conf +/opt/coins/nodes/bitcoin-abc/bch-testnet/bch-testnet.conf diff --git a/contrib/backends/bcash/debian/bcash-testnet.install b/contrib/backends/bcash/debian/bcash-testnet.install index ce91977a..926a42fd 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.install +++ b/contrib/backends/bcash/debian/bcash-testnet.install @@ -1,2 +1,2 @@ -bitcoin-abc/* /opt/bitcoin/bch-testnet -bch-testnet.conf /opt/bitcoin/bch-testnet +bitcoin-abc/* /opt/coins/nodes/bitcoin-abc/bch-testnet +bch-testnet.conf /opt/coins/nodes/bitcoin-abc/bch-testnet diff --git a/contrib/backends/bcash/debian/bcash-testnet.service b/contrib/backends/bcash/debian/bcash-testnet.service index 0c820b6c..0e696d50 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.service +++ b/contrib/backends/bcash/debian/bcash-testnet.service @@ -5,14 +5,14 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/bitcoin/bch-testnet/bch-testnet.conf +# /opt/coins/nodes/bitcoin-abc/bch-testnet/bch-testnet.conf [Unit] Description=Bitcoin Cash daemon (testnet) After=network.target [Service] -ExecStart=/opt/bitcoin/bch-testnet/bin/bitcoind -datadir=/opt/coins/data/bch-testnet/bitcoin -conf=/opt/bitcoin/bch-testnet/bch-testnet.conf -pid=/run/bitcoind/bch-testnet.pid +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/bitcoind/bch-testnet.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles b/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles index d18f88ce..b734a623 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles @@ -1 +1 @@ -/opt/bitcoin/btc/btc.conf +/opt/coins/nodes/bitcoin/btc/btc.conf diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.install b/contrib/backends/bitcoin/debian/bitcoin-btc.install index fe2df203..46107c83 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.install +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.install @@ -1,2 +1,2 @@ -bitcoin/* /opt/bitcoin/btc -btc.conf /opt/bitcoin/btc +bitcoin/* /opt/coins/nodes/bitcoin/btc +btc.conf /opt/coins/nodes/bitcoin/btc diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.service b/contrib/backends/bitcoin/debian/bitcoin-btc.service index 1bf91620..efe31ab9 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.service +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.service @@ -5,14 +5,14 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/bitcoin/btc/btc.conf +# /opt/coins/nodes/bitcoin/btc/btc.conf [Unit] Description=Bitcoin daemon (mainnet) After=network.target [Service] -ExecStart=/opt/bitcoin/btc/bin/bitcoind -datadir=/opt/coins/data/btc/bitcoin -conf=/opt/bitcoin/btc/btc.conf -pid=/run/bitcoind/btc.pid +ExecStart=/opt/coins/nodes/bitcoin/btc/bin/bitcoind -datadir=/opt/coins/data/btc/bitcoin -conf=/opt/coins/nodes/bitcoin/btc/btc.conf -pid=/run/bitcoind/btc.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles b/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles index 2f410641..2d919034 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles @@ -1 +1 @@ -/opt/bitcoin/btc-testnet/btc-testnet.conf +/opt/coins/nodes/bitcoin/btc-testnet/btc-testnet.conf diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.install b/contrib/backends/bitcoin/debian/bitcoin-testnet.install index a9124874..35109b8d 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.install +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.install @@ -1,2 +1,2 @@ -bitcoin/* /opt/bitcoin/btc-testnet -btc-testnet.conf /opt/bitcoin/btc-testnet +bitcoin/* /opt/coins/nodes/bitcoin/btc-testnet +btc-testnet.conf /opt/coins/nodes/bitcoin/btc-testnet diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.service b/contrib/backends/bitcoin/debian/bitcoin-testnet.service index 162017a4..5765a0e5 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.service +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.service @@ -5,14 +5,14 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/bitcoin/btc-testnet/btc-testnet.conf +# /opt/coins/nodes/bitcoin/btc-testnet/btc-testnet.conf [Unit] Description=Bitcoin daemon (testnet) After=network.target [Service] -ExecStart=/opt/bitcoin/btc-testnet/bin/bitcoind -datadir=/opt/coins/data/btc-testnet/bitcoin -conf=/opt/bitcoin/btc-testnet/btc-testnet.conf -pid=/run/bitcoind/testnet.pid +ExecStart=/opt/coins/nodes/bitcoin/btc-testnet/bin/bitcoind -datadir=/opt/coins/data/btc-testnet/bitcoin -conf=/opt/coins/nodes/bitcoin/btc-testnet/btc-testnet.conf -pid=/run/bitcoind/testnet.pid # Creates /run/bitcoind owned by bitcoin RuntimeDirectory=bitcoind User=bitcoin diff --git a/contrib/backends/zcash/debian/zcash-zec.conffiles b/contrib/backends/zcash/debian/zcash-zec.conffiles index b67eba29..9b19c6c3 100644 --- a/contrib/backends/zcash/debian/zcash-zec.conffiles +++ b/contrib/backends/zcash/debian/zcash-zec.conffiles @@ -1 +1 @@ -/opt/zcash/zec/zec.conf +/opt/coins/nodes/zcash/zec/zec.conf diff --git a/contrib/backends/zcash/debian/zcash-zec.install b/contrib/backends/zcash/debian/zcash-zec.install index 0bdf2442..629f95b1 100644 --- a/contrib/backends/zcash/debian/zcash-zec.install +++ b/contrib/backends/zcash/debian/zcash-zec.install @@ -1,2 +1,2 @@ -zcash/* /opt/zcash/zec -zec.conf /opt/zcash/zec +zcash/* /opt/coins/nodes/zcash/zec +zec.conf /opt/coins/nodes/zcash/zec diff --git a/contrib/backends/zcash/debian/zcash-zec.postinst b/contrib/backends/zcash/debian/zcash-zec.postinst index 17102469..1bd172c2 100644 --- a/contrib/backends/zcash/debian/zcash-zec.postinst +++ b/contrib/backends/zcash/debian/zcash-zec.postinst @@ -14,7 +14,7 @@ case "$1" in chown zcash:zcash /opt/coins/data/zec/zcash fi - HOME=/opt/coins/data/zec/zcash /opt/zcash/zec/bin/zcash-fetch-params + HOME=/opt/coins/data/zec/zcash /opt/coins/nodes/zcash/zec/bin/zcash-fetch-params ;; esac diff --git a/contrib/backends/zcash/debian/zcash-zec.service b/contrib/backends/zcash/debian/zcash-zec.service index 20edb965..51062409 100644 --- a/contrib/backends/zcash/debian/zcash-zec.service +++ b/contrib/backends/zcash/debian/zcash-zec.service @@ -5,7 +5,7 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /opt/zcash/zec/zec.conf +# /opt/coins/nodes/zcash/zec/zec.conf [Unit] Description=ZCash daemon (mainnet) @@ -13,7 +13,7 @@ After=network.target [Service] Environment="HOME=/opt/coins/data/zec/zcash" -ExecStart=/opt/zcash/zec/bin/zcashd -datadir=/opt/coins/data/zec/zcash -conf=/opt/zcash/zec/zec.conf -pid=/run/zcashd/zec.pid +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 # Creates /run/zcashd owned by zcash RuntimeDirectory=zcashd User=zcash From c8386cee9f3ef0c24ab90419d1708b00942eef80 Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 11 May 2018 13:50:03 +0200 Subject: [PATCH 5/6] Changed users - every coin has its own --- build/deb/debian/blockbook-bch-testnet.postinst | 8 ++++---- build/deb/debian/blockbook-bch-testnet.service | 2 +- build/deb/debian/blockbook-bch.postinst | 8 ++++---- build/deb/debian/blockbook-bch.service | 2 +- build/deb/debian/blockbook-btc-testnet.postinst | 8 ++++---- build/deb/debian/blockbook-btc-testnet.service | 2 +- build/deb/debian/blockbook-btc.postinst | 8 ++++---- build/deb/debian/blockbook-btc.service | 2 +- build/deb/debian/blockbook-zec.postinst | 8 ++++---- build/deb/debian/blockbook-zec.service | 2 +- contrib/backends/bcash/debian/bcash-bch.postinst | 8 ++++---- contrib/backends/bcash/debian/bcash-bch.service | 10 +++++----- contrib/backends/bcash/debian/bcash-testnet.postinst | 8 ++++---- contrib/backends/bcash/debian/bcash-testnet.service | 10 +++++----- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/build/deb/debian/blockbook-bch-testnet.postinst b/build/deb/debian/blockbook-bch-testnet.postinst index fb10d866..aa28cbbe 100644 --- a/build/deb/debian/blockbook-bch-testnet.postinst +++ b/build/deb/debian/blockbook-bch-testnet.postinst @@ -4,16 +4,16 @@ set -e case "$1" in configure) - if ! id -u blockbook &> /dev/null + if ! id -u blockbook-bch &> /dev/null then - useradd --system -M -U blockbook + useradd --system -M -U blockbook-bch fi for dir in /opt/coins/data/bch-testnet/blockbook /opt/coins/blockbook/bch-testnet/logs do - if [ "$(stat -c '%U' $dir)" != "blockbook" ] + if [ "$(stat -c '%U' $dir)" != "blockbook-bch" ] then - chown -R blockbook:blockbook $dir + chown -R blockbook-bch:blockbook-bch $dir fi done ;; diff --git a/build/deb/debian/blockbook-bch-testnet.service b/build/deb/debian/blockbook-bch-testnet.service index b142cfa8..d75deb7e 100644 --- a/build/deb/debian/blockbook-bch-testnet.service +++ b/build/deb/debian/blockbook-bch-testnet.service @@ -10,7 +10,7 @@ After=network.target [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=:18435 -socketio=:18436 -certfile=/opt/coins/blockbook/bch-testnet/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch-testnet/logs -User=blockbook +User=blockbook-bch Type=simple Restart=on-failure WorkingDirectory=/opt/coins/blockbook/bch-testnet diff --git a/build/deb/debian/blockbook-bch.postinst b/build/deb/debian/blockbook-bch.postinst index 2b42e29f..ee286500 100644 --- a/build/deb/debian/blockbook-bch.postinst +++ b/build/deb/debian/blockbook-bch.postinst @@ -4,16 +4,16 @@ set -e case "$1" in configure) - if ! id -u blockbook &> /dev/null + if ! id -u blockbook-bch &> /dev/null then - useradd --system -M -U blockbook + useradd --system -M -U blockbook-bch fi for dir in /opt/coins/data/bch/blockbook /opt/coins/blockbook/bch/logs do - if [ "$(stat -c '%U' $dir)" != "blockbook" ] + if [ "$(stat -c '%U' $dir)" != "blockbook-bch" ] then - chown -R blockbook:blockbook $dir + chown -R blockbook-bch:blockbook-bch $dir fi done ;; diff --git a/build/deb/debian/blockbook-bch.service b/build/deb/debian/blockbook-bch.service index dc5fa0fa..732c514e 100644 --- a/build/deb/debian/blockbook-bch.service +++ b/build/deb/debian/blockbook-bch.service @@ -10,7 +10,7 @@ After=network.target [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=:8435 -socketio=:8436 -certfile=/opt/coins/blockbook/bch/cert/blockbook -explorer=https://bitcoincash.blockexplorer.com/ -log_dir=/opt/coins/blockbook/bch/logs -User=blockbook +User=blockbook-bch Type=simple Restart=on-failure WorkingDirectory=/opt/coins/blockbook/bch diff --git a/build/deb/debian/blockbook-btc-testnet.postinst b/build/deb/debian/blockbook-btc-testnet.postinst index 5f415e5d..c8365a81 100644 --- a/build/deb/debian/blockbook-btc-testnet.postinst +++ b/build/deb/debian/blockbook-btc-testnet.postinst @@ -4,16 +4,16 @@ set -e case "$1" in configure) - if ! id -u blockbook &> /dev/null + if ! id -u blockbook-btc &> /dev/null then - useradd --system -M -U blockbook + useradd --system -M -U blockbook-btc fi for dir in /opt/coins/data/btc-testnet/blockbook /opt/coins/blockbook/btc-testnet/logs do - if [ "$(stat -c '%U' $dir)" != "blockbook" ] + if [ "$(stat -c '%U' $dir)" != "blockbook-btc" ] then - chown -R blockbook:blockbook $dir + chown -R blockbook-btc:blockbook-btc $dir fi done ;; diff --git a/build/deb/debian/blockbook-btc-testnet.service b/build/deb/debian/blockbook-btc-testnet.service index 9eea273a..2d8208f0 100644 --- a/build/deb/debian/blockbook-btc-testnet.service +++ b/build/deb/debian/blockbook-btc-testnet.service @@ -10,7 +10,7 @@ After=network.target [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=:18335 -socketio=:18336 -certfile=/opt/coins/blockbook/btc-testnet/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc-testnet/logs -User=blockbook +User=blockbook-btc Type=simple Restart=on-failure WorkingDirectory=/opt/coins/blockbook/btc-testnet diff --git a/build/deb/debian/blockbook-btc.postinst b/build/deb/debian/blockbook-btc.postinst index 9b4d0324..9b839b8e 100644 --- a/build/deb/debian/blockbook-btc.postinst +++ b/build/deb/debian/blockbook-btc.postinst @@ -4,16 +4,16 @@ set -e case "$1" in configure) - if ! id -u blockbook &> /dev/null + if ! id -u blockbook-btc &> /dev/null then - useradd --system -M -U blockbook + useradd --system -M -U blockbook-btc fi for dir in /opt/coins/data/btc/blockbook /opt/coins/blockbook/btc/logs do - if [ "$(stat -c '%U' $dir)" != "blockbook" ] + if [ "$(stat -c '%U' $dir)" != "blockbook-btc" ] then - chown -R blockbook:blockbook $dir + chown -R blockbook-btc:blockbook-btc $dir fi done ;; diff --git a/build/deb/debian/blockbook-btc.service b/build/deb/debian/blockbook-btc.service index 4bd5f704..c0419764 100644 --- a/build/deb/debian/blockbook-btc.service +++ b/build/deb/debian/blockbook-btc.service @@ -10,7 +10,7 @@ After=network.target [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=:8335 -socketio=:8336 -certfile=/opt/coins/blockbook/btc/cert/blockbook -explorer=https://bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/btc/logs -User=blockbook +User=blockbook-btc Type=simple Restart=on-failure WorkingDirectory=/opt/coins/blockbook/btc diff --git a/build/deb/debian/blockbook-zec.postinst b/build/deb/debian/blockbook-zec.postinst index b0a04213..668103af 100644 --- a/build/deb/debian/blockbook-zec.postinst +++ b/build/deb/debian/blockbook-zec.postinst @@ -4,16 +4,16 @@ set -e case "$1" in configure) - if ! id -u blockbook &> /dev/null + if ! id -u blockbook-zec &> /dev/null then - useradd --system -M -U blockbook + useradd --system -M -U blockbook-zec fi for dir in /opt/coins/data/zec/blockbook /opt/coins/blockbook/zec/logs do - if [ "$(stat -c '%U' $dir)" != "blockbook" ] + if [ "$(stat -c '%U' $dir)" != "blockbook-zec" ] then - chown -R blockbook:blockbook $dir + chown -R blockbook-zec:blockbook-zec $dir fi done ;; diff --git a/build/deb/debian/blockbook-zec.service b/build/deb/debian/blockbook-zec.service index 8dd87fc9..4e0297e4 100644 --- a/build/deb/debian/blockbook-zec.service +++ b/build/deb/debian/blockbook-zec.service @@ -10,7 +10,7 @@ After=network.target [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=:8235 -socketio=:8236 -certfile=/opt/coins/blockbook/zec/cert/blockbook -explorer=https://zec-bitcore1.trezor.io/ -log_dir=/opt/coins/blockbook/zec/logs -User=blockbook +User=blockbook-zec Type=simple Restart=on-failure WorkingDirectory=/opt/coins/blockbook/zec diff --git a/contrib/backends/bcash/debian/bcash-bch.postinst b/contrib/backends/bcash/debian/bcash-bch.postinst index ebe53305..8ebc60a1 100644 --- a/contrib/backends/bcash/debian/bcash-bch.postinst +++ b/contrib/backends/bcash/debian/bcash-bch.postinst @@ -4,14 +4,14 @@ set -e case "$1" in configure) - if ! id -u bitcoin &> /dev/null + if ! id -u bcash &> /dev/null then - useradd --system -M -U bitcoin + useradd --system -M -U bcash fi - if [ "$(stat -c '%U' /opt/coins/data/bch/bitcoin)" != "bitcoin" ] + if [ "$(stat -c '%U' /opt/coins/data/bch/bitcoin)" != "bcash" ] then - chown bitcoin:bitcoin /opt/coins/data/bch/bitcoin + chown bcash:bcash /opt/coins/data/bch/bitcoin fi ;; diff --git a/contrib/backends/bcash/debian/bcash-bch.service b/contrib/backends/bcash/debian/bcash-bch.service index 7f6a4700..d0f81c60 100644 --- a/contrib/backends/bcash/debian/bcash-bch.service +++ b/contrib/backends/bcash/debian/bcash-bch.service @@ -12,12 +12,12 @@ 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/bitcoind/bch.pid -# Creates /run/bitcoind owned by bitcoin -RuntimeDirectory=bitcoind -User=bitcoin +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 +# Creates /run/bitcoin-abc owned by bcash +RuntimeDirectory=bitcoin-abc +User=bcash Type=forking -PIDFile=/run/bitcoind/bch.pid +PIDFile=/run/bitcoin-abc/bch.pid Restart=on-failure # Hardening measures diff --git a/contrib/backends/bcash/debian/bcash-testnet.postinst b/contrib/backends/bcash/debian/bcash-testnet.postinst index 291f74a4..db7ce0da 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.postinst +++ b/contrib/backends/bcash/debian/bcash-testnet.postinst @@ -4,14 +4,14 @@ set -e case "$1" in configure) - if ! id -u bitcoin &> /dev/null + if ! id -u bcash &> /dev/null then - useradd --system -M -U bitcoin + useradd --system -M -U bcash fi - if [ "$(stat -c '%U' /opt/coins/data/bch-testnet/bitcoin)" != "bitcoin" ] + if [ "$(stat -c '%U' /opt/coins/data/bch-testnet/bitcoin)" != "bcash" ] then - chown bitcoin:bitcoin /opt/coins/data/bch-testnet/bitcoin + chown bcash:bcash /opt/coins/data/bch-testnet/bitcoin fi ;; diff --git a/contrib/backends/bcash/debian/bcash-testnet.service b/contrib/backends/bcash/debian/bcash-testnet.service index 0e696d50..4894074b 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.service +++ b/contrib/backends/bcash/debian/bcash-testnet.service @@ -12,12 +12,12 @@ 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/bitcoind/bch-testnet.pid -# Creates /run/bitcoind owned by bitcoin -RuntimeDirectory=bitcoind -User=bitcoin +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 +# Creates /run/bitcoin-abc owned by bcash +RuntimeDirectory=bitcoin-abc +User=bcash Type=forking -PIDFile=/run/bitcoind/bch-testnet.pid +PIDFile=/run/bitcoin-abc/bch-testnet.pid Restart=on-failure # Hardening measures From 469f7432cbc2f565cebcc85cc8b5a657ff6b2384 Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Sat, 12 May 2018 21:14:59 +0200 Subject: [PATCH 6/6] Change owner of whole dir tree (important when altering user) --- contrib/backends/bcash/debian/bcash-bch.postinst | 2 +- contrib/backends/bcash/debian/bcash-testnet.postinst | 2 +- contrib/backends/bitcoin/debian/bitcoin-btc.postinst | 2 +- contrib/backends/bitcoin/debian/bitcoin-testnet.postinst | 2 +- contrib/backends/zcash/debian/zcash-zec.postinst | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/backends/bcash/debian/bcash-bch.postinst b/contrib/backends/bcash/debian/bcash-bch.postinst index 8ebc60a1..82a9b058 100644 --- a/contrib/backends/bcash/debian/bcash-bch.postinst +++ b/contrib/backends/bcash/debian/bcash-bch.postinst @@ -11,7 +11,7 @@ case "$1" in if [ "$(stat -c '%U' /opt/coins/data/bch/bitcoin)" != "bcash" ] then - chown bcash:bcash /opt/coins/data/bch/bitcoin + chown -R bcash:bcash /opt/coins/data/bch/bitcoin fi ;; diff --git a/contrib/backends/bcash/debian/bcash-testnet.postinst b/contrib/backends/bcash/debian/bcash-testnet.postinst index db7ce0da..8692e3f4 100644 --- a/contrib/backends/bcash/debian/bcash-testnet.postinst +++ b/contrib/backends/bcash/debian/bcash-testnet.postinst @@ -11,7 +11,7 @@ case "$1" in if [ "$(stat -c '%U' /opt/coins/data/bch-testnet/bitcoin)" != "bcash" ] then - chown bcash:bcash /opt/coins/data/bch-testnet/bitcoin + chown -R bcash:bcash /opt/coins/data/bch-testnet/bitcoin fi ;; diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.postinst b/contrib/backends/bitcoin/debian/bitcoin-btc.postinst index 17317f8b..84a26bf8 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-btc.postinst +++ b/contrib/backends/bitcoin/debian/bitcoin-btc.postinst @@ -11,7 +11,7 @@ case "$1" in if [ "$(stat -c '%U' /opt/coins/data/btc/bitcoin)" != "bitcoin" ] then - chown bitcoin:bitcoin /opt/coins/data/btc/bitcoin + chown -R bitcoin:bitcoin /opt/coins/data/btc/bitcoin fi ;; diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst b/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst index 757eb71e..e95584a3 100644 --- a/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst +++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst @@ -11,7 +11,7 @@ case "$1" in if [ "$(stat -c '%U' /opt/coins/data/btc-testnet/bitcoin)" != "bitcoin" ] then - chown bitcoin:bitcoin /opt/coins/data/btc-testnet/bitcoin + chown -R bitcoin:bitcoin /opt/coins/data/btc-testnet/bitcoin fi ;; diff --git a/contrib/backends/zcash/debian/zcash-zec.postinst b/contrib/backends/zcash/debian/zcash-zec.postinst index 1bd172c2..510c8a43 100644 --- a/contrib/backends/zcash/debian/zcash-zec.postinst +++ b/contrib/backends/zcash/debian/zcash-zec.postinst @@ -11,7 +11,7 @@ case "$1" in if [ "$(stat -c '%U' /opt/coins/data/zec/zcash)" != "zcash" ] then - chown zcash:zcash /opt/coins/data/zec/zcash + chown -R zcash:zcash /opt/coins/data/zec/zcash fi HOME=/opt/coins/data/zec/zcash /opt/coins/nodes/zcash/zec/bin/zcash-fetch-params