diff --git a/test-network/organizations/cfssl/registerEnroll.sh b/test-network/organizations/cfssl/registerEnroll.sh index 3da0e0b447..d5bac21efc 100755 --- a/test-network/organizations/cfssl/registerEnroll.sh +++ b/test-network/organizations/cfssl/registerEnroll.sh @@ -72,7 +72,7 @@ function orderer_cert() { cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/tlsca/tlsca.example.com-cert.pem" cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/msp/cacerts/" - cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/msp/tlscacerts/" + cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/msp/tlscacerts/tlsca.example.com-cert.pem" echo 'NodeOUs: Enable: true @@ -176,7 +176,7 @@ function generate_peer_certs() { cfssl gencert \ -ca="$CERT_DIR/ca/ca.pem" \ -ca-key="$CERT_DIR/ca/ca-key.pem" \ - -config="$PWD/organizations/cfssl/cert-signing-config.jso"n \ + -config="$PWD/organizations/cfssl/cert-signing-config.json" \ -cn="$USER" \ -hostname="$USER,localhost,127.0.0.1" \ -profile="sign" \ @@ -243,7 +243,7 @@ function generate_orderer_certs() { mv "$CERT_DIR/orderers/$USER/msp/signcerts/cert-key.pem" "$CERT_DIR/orderers/$USER/msp/keystore" cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/orderers/$USER/msp/cacerts" - cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/orderers/$USER/msp/tlscacerts" + cp "$CERT_DIR/ca/ca.pem" "$CERT_DIR/orderers/$USER/msp/tlscacerts/tlsca.example.com-cert.pem" echo 'NodeOUs: Enable: true diff --git a/test-network/scripts/utils.sh b/test-network/scripts/utils.sh index e5a7aca67f..968654d8a6 100755 --- a/test-network/scripts/utils.sh +++ b/test-network/scripts/utils.sh @@ -15,6 +15,7 @@ function printHelp() { println println " Flags:" println " -ca - Use Certificate Authorities to generate network crypto material" + println " -cfssl - Use CFSSL CA to generate network crypto material" println " -bft - Use Orderers with consensus type BFT (Not available in Fabric v2.x)" println " -c - Name of channel to create (defaults to \"mychannel\")" println " -s - Peer state database to deploy: goleveldb (default) or couchdb" @@ -111,6 +112,7 @@ function printHelp() { println " Flags:" println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:" println " -ca - Use Certificate Authorities to generate network crypto material" + println " -cfssl - Use CFSSL CA to generate network crypto material" println " -bft - Use Orderers with consensus type BFT (Not available in Fabric v2.x)" println " -c - Name of channel to create (defaults to \"mychannel\")" println " -s - Peer state database to deploy: goleveldb (default) or couchdb"