Skip to content
Snippets Groups Projects
Commit 968d71d0 authored by Jono Wenger's avatar Jono Wenger
Browse files

Get UDB ID from contact instead of printing it

parent 83643e9c
No related branches found
No related tags found
No related merge requests found
......@@ -26,8 +26,8 @@ nodeMetricInterval: 3
disableGatewayPing: true
# UDB ID
udbID: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD"
# "Location of the user discovery contact file.
udContactPath: "results/udContact.bin"
udbAddress: "127.0.0.1:18001"
# Path to UDB public key PEM file
udbPubKeyPemPath: "../keys/cmix.rip.crt"
......
......@@ -36,6 +36,7 @@ CLIENTCLEAN=results/clients-cleaned
CLIENTOPTS="--password hello --ndf results/ndf.json --waitTimeout 90 --unsafe-channel-creation --verbose"
CLIENTUDOPTS="--password hello --ndf results/ndf.json --verbose"
CLIENTSINGLEOPTS="--password hello --ndf results/ndf.json --verbose"
mkdir -p $SERVERLOGS
mkdir -p $GATEWAYLOGS
......@@ -46,14 +47,11 @@ if [ "$PERMISSIONING" == "" ]
then
echo "STARTING SERVERS..."
UDBID=$(../bin/client init -s results/udbsession -l results/udbidgen.log --password hello --ndf ndf.json)
UDBID=$(../bin/client init -s results/udbsession -l results/udbidgen.log --password hello --ndf ndf.json --writeContact results/udContact.bin)
echo "GENERATED UDB ID: $UDBID"
UDBID=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$UDBID")
cp permissioning.yaml permissioning-actual.yaml
sed -i.bak "s/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD/$UDBID/g" permissioning-actual.yaml
PERMCMD="../bin/permissioning --logLevel 2 -c permissioning-actual.yaml "
PERMCMD="../bin/permissioning --logLevel 2 -c permissioning.yaml "
$PERMCMD > results/permissioning-console.txt 2>&1 &
PIDVAL=$!
echo "$PERMCMD -- $PIDVAL"
......
......@@ -53,7 +53,7 @@ certPath: "../keys/cmix.rip.crt"
# Path to the certificate file
serverCertPath: "../keys/cmix.rip.crt"
udbID: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD"
udContactPath: "udContact.bin"
udbAddress: "127.0.0.1:18001"
# Path to UDB public key PEM file
udbPubKeyPemPath: "../keys/cmix.rip.crt"
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment