epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-22 09:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ FAB-8679 ] Permit samples to use RootCAs

Browse source 
Fix USE_INTERMEDIATE_CA variable to allow
exclusive use of RootCA for sample tests.

Change-Id: If10f9a768ba17943f03b416f5a68edb9eb65a27a
Signed-off-by: rennman <eabailey@us.ibm.com>
This commit is contained in:
rennman 2018-03-06 13:42:48 -05:00
parent 9f9fc7e5ac
commit 823fb6b9c5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fabric-ca/scripts/env.sh
View file

@ -127,7 +127,7 @@ function initOrgVars {
ORG_ADMIN_CERT=${ORG_MSP_DIR}/admincerts/cert.pem ORG_ADMIN_CERT=${ORG_MSP_DIR}/admincerts/cert.pem
ORG_ADMIN_HOME=/${DATA}/orgs/$ORG/admin ORG_ADMIN_HOME=/${DATA}/orgs/$ORG/admin
if $USE_INTERMEDIATE_CA; then if test "$USE_INTERMEDIATE_CA" = "true"; then
CA_NAME=$INT_CA_NAME CA_NAME=$INT_CA_NAME
CA_HOST=$INT_CA_HOST CA_HOST=$INT_CA_HOST
CA_CHAINFILE=$INT_CA_CHAINFILE CA_CHAINFILE=$INT_CA_CHAINFILE
@ -169,7 +169,7 @@ function initOrdererVars {
TLSDIR=$MYHOME/tls TLSDIR=$MYHOME/tls
export ORDERER_GENERAL_TLS_PRIVATEKEY=$TLSDIR/server.key export ORDERER_GENERAL_TLS_PRIVATEKEY=$TLSDIR/server.key
export ORDERER_GENERAL_TLS_CERTIFICATE=$TLSDIR/server.crt export ORDERER_GENERAL_TLS_CERTIFICATE=$TLSDIR/server.crt
export ORDERER_GENERAL_TLS_ROOTCAS=[$INT_CA_CHAINFILE] export ORDERER_GENERAL_TLS_ROOTCAS=[$CA_CHAINFILE]
} }
function genClientTLSCert { function genClientTLSCert {
@ -221,7 +221,7 @@ function initPeerVars {
export CORE_LOGGING_LEVEL=DEBUG export CORE_LOGGING_LEVEL=DEBUG
export CORE_PEER_TLS_ENABLED=true export CORE_PEER_TLS_ENABLED=true
export CORE_PEER_TLS_CLIENTAUTHREQUIRED=true export CORE_PEER_TLS_CLIENTAUTHREQUIRED=true
export CORE_PEER_TLS_ROOTCERT_FILE=$INT_CA_CHAINFILE export CORE_PEER_TLS_ROOTCERT_FILE=$CA_CHAINFILE
export CORE_PEER_TLS_CLIENTCERT_FILE=/$DATA/tls/$PEER_NAME-cli-client.crt export CORE_PEER_TLS_CLIENTCERT_FILE=/$DATA/tls/$PEER_NAME-cli-client.crt
export CORE_PEER_TLS_CLIENTKEY_FILE=/$DATA/tls/$PEER_NAME-cli-client.key export CORE_PEER_TLS_CLIENTKEY_FILE=/$DATA/tls/$PEER_NAME-cli-client.key
export CORE_PEER_PROFILE_ENABLED=true export CORE_PEER_PROFILE_ENABLED=true