From 5b8c4390dbe2563e005f76392a9d9b067e787ba6 Mon Sep 17 00:00:00 2001 From: Nikhil Gupta Date: Tue, 12 Jan 2021 18:22:55 -0500 Subject: [PATCH] Cleanup of register/enroll script Signed-off-by: Nikhil Gupta --- .../addOrg3/fabric-ca/registerEnroll.sh | 12 ------- .../organizations/fabric-ca/registerEnroll.sh | 32 ------------------- 2 files changed, 44 deletions(-) diff --git a/test-network/addOrg3/fabric-ca/registerEnroll.sh b/test-network/addOrg3/fabric-ca/registerEnroll.sh index 65b4122c..e2d49c14 100644 --- a/test-network/addOrg3/fabric-ca/registerEnroll.sh +++ b/test-network/addOrg3/fabric-ca/registerEnroll.sh @@ -5,15 +5,11 @@ # SPDX-License-Identifier: Apache-2.0 # -. ../../scripts/utils.sh - function createOrg3 { infoln "Enrolling the CA admin" mkdir -p ../organizations/peerOrganizations/org3.example.com/ export FABRIC_CA_CLIENT_HOME=${PWD}/../organizations/peerOrganizations/org3.example.com/ -# rm -rf $FABRIC_CA_CLIENT_HOME/fabric-ca-client-config.yaml -# rm -rf $FABRIC_CA_CLIENT_HOME/msp set -x fabric-ca-client enroll -u https://admin:adminpw@localhost:11054 --caname ca-org3 --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem @@ -49,9 +45,6 @@ function createOrg3 { fabric-ca-client register --caname ca-org3 --id.name org3admin --id.secret org3adminpw --id.type admin --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem { set +x; } 2>/dev/null - mkdir -p ../organizations/peerOrganizations/org3.example.com/peers - mkdir -p ../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com - infoln "Generating the peer0 msp" set -x fabric-ca-client enroll -u https://peer0:peer0pw@localhost:11054 --caname ca-org3 -M ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp --csr.hosts peer0.org3.example.com --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem @@ -78,9 +71,6 @@ function createOrg3 { mkdir ${PWD}/../organizations/peerOrganizations/org3.example.com/ca cp ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/cacerts/* ${PWD}/../organizations/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem - mkdir -p ../organizations/peerOrganizations/org3.example.com/users - mkdir -p ../organizations/peerOrganizations/org3.example.com/users/User1@org3.example.com - infoln "Generating the user msp" set -x fabric-ca-client enroll -u https://user1:user1pw@localhost:11054 --caname ca-org3 -M ${PWD}/../organizations/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem @@ -88,8 +78,6 @@ function createOrg3 { cp ${PWD}/../organizations/peerOrganizations/org3.example.com/msp/config.yaml ${PWD}/../organizations/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/config.yaml - mkdir -p ../organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com - infoln "Generating the org admin msp" set -x fabric-ca-client enroll -u https://org3admin:org3adminpw@localhost:11054 --caname ca-org3 -M ${PWD}/../organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem diff --git a/test-network/organizations/fabric-ca/registerEnroll.sh b/test-network/organizations/fabric-ca/registerEnroll.sh index c064d024..89ab538b 100755 --- a/test-network/organizations/fabric-ca/registerEnroll.sh +++ b/test-network/organizations/fabric-ca/registerEnroll.sh @@ -1,14 +1,10 @@ #!/bin/bash -source scripts/utils.sh - function createOrg1() { infoln "Enrolling the CA admin" mkdir -p organizations/peerOrganizations/org1.example.com/ export FABRIC_CA_CLIENT_HOME=${PWD}/organizations/peerOrganizations/org1.example.com/ - # rm -rf $FABRIC_CA_CLIENT_HOME/fabric-ca-client-config.yaml - # rm -rf $FABRIC_CA_CLIENT_HOME/msp set -x fabric-ca-client enroll -u https://admin:adminpw@localhost:7054 --caname ca-org1 --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem @@ -44,9 +40,6 @@ function createOrg1() { fabric-ca-client register --caname ca-org1 --id.name org1admin --id.secret org1adminpw --id.type admin --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem { set +x; } 2>/dev/null - mkdir -p organizations/peerOrganizations/org1.example.com/peers - mkdir -p organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com - infoln "Generating the peer0 msp" set -x fabric-ca-client enroll -u https://peer0:peer0pw@localhost:7054 --caname ca-org1 -M ${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp --csr.hosts peer0.org1.example.com --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem @@ -72,9 +65,6 @@ function createOrg1() { mkdir -p ${PWD}/organizations/peerOrganizations/org1.example.com/ca cp ${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/* ${PWD}/organizations/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem - mkdir -p organizations/peerOrganizations/org1.example.com/users - mkdir -p organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com - infoln "Generating the user msp" set -x fabric-ca-client enroll -u https://user1:user1pw@localhost:7054 --caname ca-org1 -M ${PWD}/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem @@ -82,8 +72,6 @@ function createOrg1() { cp ${PWD}/organizations/peerOrganizations/org1.example.com/msp/config.yaml ${PWD}/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/config.yaml - mkdir -p organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com - infoln "Generating the org admin msp" set -x fabric-ca-client enroll -u https://org1admin:org1adminpw@localhost:7054 --caname ca-org1 -M ${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem @@ -97,8 +85,6 @@ function createOrg2() { mkdir -p organizations/peerOrganizations/org2.example.com/ export FABRIC_CA_CLIENT_HOME=${PWD}/organizations/peerOrganizations/org2.example.com/ - # rm -rf $FABRIC_CA_CLIENT_HOME/fabric-ca-client-config.yaml - # rm -rf $FABRIC_CA_CLIENT_HOME/msp set -x fabric-ca-client enroll -u https://admin:adminpw@localhost:8054 --caname ca-org2 --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem @@ -134,9 +120,6 @@ function createOrg2() { fabric-ca-client register --caname ca-org2 --id.name org2admin --id.secret org2adminpw --id.type admin --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem { set +x; } 2>/dev/null - mkdir -p organizations/peerOrganizations/org2.example.com/peers - mkdir -p organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com - infoln "Generating the peer0 msp" set -x fabric-ca-client enroll -u https://peer0:peer0pw@localhost:8054 --caname ca-org2 -M ${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp --csr.hosts peer0.org2.example.com --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem @@ -162,9 +145,6 @@ function createOrg2() { mkdir -p ${PWD}/organizations/peerOrganizations/org2.example.com/ca cp ${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/* ${PWD}/organizations/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem - mkdir -p organizations/peerOrganizations/org2.example.com/users - mkdir -p organizations/peerOrganizations/org2.example.com/users/User1@org2.example.com - infoln "Generating the user msp" set -x fabric-ca-client enroll -u https://user1:user1pw@localhost:8054 --caname ca-org2 -M ${PWD}/organizations/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem @@ -172,8 +152,6 @@ function createOrg2() { cp ${PWD}/organizations/peerOrganizations/org2.example.com/msp/config.yaml ${PWD}/organizations/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/config.yaml - mkdir -p organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com - infoln "Generating the org admin msp" set -x fabric-ca-client enroll -u https://org2admin:org2adminpw@localhost:8054 --caname ca-org2 -M ${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem @@ -187,8 +165,6 @@ function createOrderer() { mkdir -p organizations/ordererOrganizations/example.com export FABRIC_CA_CLIENT_HOME=${PWD}/organizations/ordererOrganizations/example.com - # rm -rf $FABRIC_CA_CLIENT_HOME/fabric-ca-client-config.yaml - # rm -rf $FABRIC_CA_CLIENT_HOME/msp set -x fabric-ca-client enroll -u https://admin:adminpw@localhost:9054 --caname ca-orderer --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem @@ -219,11 +195,6 @@ function createOrderer() { fabric-ca-client register --caname ca-orderer --id.name ordererAdmin --id.secret ordererAdminpw --id.type admin --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem { set +x; } 2>/dev/null - mkdir -p organizations/ordererOrganizations/example.com/orderers - mkdir -p organizations/ordererOrganizations/example.com/orderers/example.com - - mkdir -p organizations/ordererOrganizations/example.com/orderers/orderer.example.com - infoln "Generating the orderer msp" set -x fabric-ca-client enroll -u https://orderer:ordererpw@localhost:9054 --caname ca-orderer -M ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp --csr.hosts orderer.example.com --csr.hosts localhost --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem @@ -246,9 +217,6 @@ function createOrderer() { mkdir -p ${PWD}/organizations/ordererOrganizations/example.com/msp/tlscacerts cp ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/tlscacerts/* ${PWD}/organizations/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem - mkdir -p organizations/ordererOrganizations/example.com/users - mkdir -p organizations/ordererOrganizations/example.com/users/Admin@example.com - infoln "Generating the admin msp" set -x fabric-ca-client enroll -u https://ordererAdmin:ordererAdminpw@localhost:9054 --caname ca-orderer -M ${PWD}/organizations/ordererOrganizations/example.com/users/Admin@example.com/msp --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem