From 9b6a3ec8359953bd4e8d51df55af55593568c113 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 27 Aug 2020 12:17:41 +0200 Subject: [PATCH] generate-secrets: extract fn 'makeHMAC' --- pkgs/generate-secrets/generate-secrets.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/generate-secrets/generate-secrets.sh b/pkgs/generate-secrets/generate-secrets.sh index ef3611b..5a60cbe 100755 --- a/pkgs/generate-secrets/generate-secrets.sh +++ b/pkgs/generate-secrets/generate-secrets.sh @@ -5,6 +5,10 @@ opensslConf=${1:-openssl.cnf} makePasswordSecret() { [[ -e $1 ]] || apg -m 20 -x 20 -M Ncl -n 1 > "$1" } +makeHMAC() { + user=$1 + rpcauth $user $(cat bitcoin-rpcpassword-$user) | grep rpcauth | cut -d ':' -f 2 > bitcoin-HMAC-$user +} makePasswordSecret bitcoin-rpcpassword-privileged makePasswordSecret bitcoin-rpcpassword-public @@ -14,8 +18,8 @@ makePasswordSecret lightning-charge-token makePasswordSecret spark-wallet-password makePasswordSecret backup-encryption-password -[[ -e bitcoin-HMAC-privileged ]] || rpcauth privileged $(cat bitcoin-rpcpassword-privileged) | grep rpcauth | cut -d ':' -f 2 > bitcoin-HMAC-privileged -[[ -e bitcoin-HMAC-public ]] || rpcauth public $(cat bitcoin-rpcpassword-public) | grep rpcauth | cut -d ':' -f 2 > bitcoin-HMAC-public +[[ -e bitcoin-HMAC-privileged ]] || makeHMAC privileged +[[ -e bitcoin-HMAC-public ]] || makeHMAC public [[ -e lightning-charge-env ]] || echo "API_TOKEN=$(cat lightning-charge-token)" > lightning-charge-env [[ -e nanopos-env ]] || echo "CHARGE_TOKEN=$(cat lightning-charge-token)" > nanopos-env [[ -e spark-wallet-login ]] || echo "login=spark-wallet:$(cat spark-wallet-password)" > spark-wallet-login