summaryrefslogtreecommitdiff
path: root/bin/taler-deployment-config-generate
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2019-06-08 13:45:41 +0200
committerMarcello Stanisci <stanisci.m@gmail.com>2019-06-08 13:45:41 +0200
commit611e60c3fa58fecc10a821d5b4e1d77eca5528a3 (patch)
tree53be93cb8bda0a6a4369660593aa99cd380f2f5c /bin/taler-deployment-config-generate
parenta30d49bccd6545d4b6d99785987777b4c452cd60 (diff)
downloaddeployment-611e60c3fa58fecc10a821d5b4e1d77eca5528a3.tar.gz
deployment-611e60c3fa58fecc10a821d5b4e1d77eca5528a3.tar.bz2
deployment-611e60c3fa58fecc10a821d5b4e1d77eca5528a3.zip
Avoid hardcoded paths
Diffstat (limited to 'bin/taler-deployment-config-generate')
-rwxr-xr-xbin/taler-deployment-config-generate32
1 files changed, 16 insertions, 16 deletions
diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate
index 638098b..8dd5695 100755
--- a/bin/taler-deployment-config-generate
+++ b/bin/taler-deployment-config-generate
@@ -9,9 +9,7 @@
set -eu
-base=$HOME
-
-export PATH="$base/deployment":$PATH
+export PATH="$HOME/deployment":$PATH
if [[ -z ${TALER_CONFIG_ENV+x} ]]; then
echo "TALER_CONFIG_ENV not set"
@@ -23,24 +21,26 @@ if [[ -z ${TALER_CONFIG_CURRENCY+x} ]]; then
exit 1
fi
-if [[ ! -f $HOME/shared-data/exchange/offline-keys/master.priv ]] ; then
- mkdir -p $HOME/shared-data/exchange/offline-keys/
- cp $base/deployment/private-keys/${TALER_CONFIG_ENV}-exchange-master.priv $HOME/shared-data/exchange/offline-keys/master.priv
- chgrp ${TALER_CONFIG_ENV} $HOME/shared-data/exchange/offline-keys/master.priv
- chmod g+rx $HOME/shared-data/exchange/offline-keys/master.priv
-fi
+EXCHANGE_MASTER_PRIV=$(taler-config -s exchange -o master_priv_file -f)
+AUDITOR_MASTER_PRIV=$(taler-config -s auditor -o auditor_priv_file -f)
-if [[ ! -f $HOME/shared-data/auditor/offline-keys/auditor.priv ]] ; then
- mkdir -p $HOME/shared-data/auditor/offline-keys/
- cp $base/deployment/private-keys/auditor.priv $HOME/shared-data/auditor/offline-keys/auditor.priv
- chgrp ${TALER_CONFIG_ENV} $HOME/shared-data/auditor/offline-keys/auditor.priv
- chmod g+rx $HOME/shared-data/auditor/offline-keys/auditor.priv
+if [[ ! -f $EXCHANGE_MASTER_PRIV ]] ; then
+ mkdir -p $(dirname $EXCHANGE_MASTER_PRIV)
+ cp $HOME/deployment/private-keys/${TALER_CONFIG_ENV}-exchange-master.priv $EXCHANGE_MASTER_PRIV
+ chgrp ${TALER_CONFIG_ENV} $EXCHANGE_MASTER_PRIV
+ chmod g+rx $EXCHANGE_MASTER_PRIV
fi
-exchange_pub=$(gnunet-ecc -p $HOME/shared-data/exchange/offline-keys/master.priv)
+if [[ ! -f $AUDITOR_MASTER_PRIV ]] ; then
+ mkdir -p $(dirname $AUDITOR_MASTER_PRIV)
+ cp $HOME/deployment/private-keys/${TALER_CONFIG_ENV}-exchange-master.priv $AUDITOR_MASTER_PRIV
+ chgrp ${TALER_CONFIG_ENV} $AUDITOR_MASTER_PRIV
+ chmod g+rx $AUDITOR_MASTER_PRIV
+fi
+EXCHANGE_PUB=$(gnunet-ecc -p $EXCHANGE_MASTER_PRIV)
$HOME/deployment/config/generate-config \
- --exchange-pub "$exchange_pub" \
+ --exchange-pub "$EXCHANGE_PUB" \
--currency "$TALER_CONFIG_CURRENCY" \
--outdir $HOME/.config \
--shared-outdir $HOME/shared-data \