FAB-1338: Fix configs after rename

This updates the configs such that the server
and client can connect.

Change-Id: Ie7e8f66109daed90a720e7dac28651b9b487e4a9
Signed-off-by: Latitia M Haskins <[email protected]>

docker/.env

@@ -1,4 +1,4 @@
 CA_CERTIFICATE=ec.pem
 CA_KEY_CERTIFICATE=ec-key.pem
-FABRIC_CA_CONFIG=config.json
+FABRIC_CA_CONFIG=server-config.json
 CSR_CONFIG=csr.json

docker/docker-compose-fabric-ca.yml

@@ -1,5 +1,6 @@
 fabric-ca:
    image: hyperledger/fabric-ca
+   container_name: fabric-ca
    ports:
      - "8888:8888"
    environment:
@@ -13,6 +14,7 @@ fabric-ca:
 
 admin-client:
    image: hyperledger/fabric-ca
+   container_name: admin-client
    environment:
      - CSR_CONFIG=${CSR_CONFIG}
    volumes:
@@ -24,6 +26,7 @@ admin-client:
 
 sdk-client:
    image: hyperledger/fabric-ca
+   container_name: sdk-client
    environment:
      - CSR_CONFIG=${CSR_CONFIG}
    volumes:
@@ -35,6 +38,7 @@ sdk-client:
 
 bob-client:
    image: hyperledger/fabric-ca
+   container_name: bob-client
    environment:
      - CSR_CONFIG=${CSR_CONFIG}
    volumes:

images/fabric-ca/Dockerfile.in

@@ -5,10 +5,6 @@ COPY payload/fabric-ca /usr/local/bin
 
 # Copy the configuration files
 ADD payload/sampleconfig.tar.bz2 $FABRIC_CA_HOME
-#COPY payload/server-config.json /config/server-config.json
-#COPY payload/server-config-psql.json /config/server-config-psql.json
-#COPY payload/.json /config/csr.json
-#COPY payload/client-config.json /etc/hyperledger/fabric-ca/client-config.json
 
 # Copy the same certificates that are currently hardcoded into the peers
 COPY payload/root.pem /.fabric-ca/root.pem

images/fabric-ca/config/client-config.json

@@ -1,5 +1,5 @@
 {
-"ca_certfiles":["/root/.fabric-ca/root.pem"],
-"client":{"keyfile":"/root/.fabric-ca/tls_client-key.pem",
-    "certfile":"/root/.fabric-ca/tls_client-cert.pem"}
+"ca_certfiles":["/.fabric-ca/root.pem"],
+"client":{"keyfile":"/.fabric-ca/tls_client-key.pem",
+    "certfile":"/.fabric-ca/tls_client-cert.pem"}
 }

images/fabric-ca/config/server-config.json

@@ -0,0 +1,25 @@
+{
+ "tls_disable":true,
+ "ca_cert":"/.fabric-ca/ec.pem",
+ "ca_key":"/.fabric-ca/ec-key.pem",
+ "users": {
+    "admin": {
+      "pass": "adminpw",
+      "type": "client",
+      "group": "bank_a",
+      "attrs": [{"name":"hf.Registrar.Roles","value":"client,peer,validator,auditor"}, {"name":"hf.Registrar.DelegateRoles", "value": "client"}]
+    }
+ },
+ "groups": {
+   "banks_and_institutions": {
+     "banks": ["bank_a", "bank_b", "bank_c"],
+     "institutions": ["institution_a"]
+   }
+ },
+ "signing": {
+    "default": {
+       "usages": ["cert sign"],
+       "expiry": "8000h"
+    }
+ }
+}