[FAB-5462] Remove non-existent files from yaml

This change set changes the automatically generated server's
config file so that it contains no paths to non-existent
files.  A yaml file comment indicates the default filenames
where appropriate.

Change-Id: I411efed514b304b7eaf52a09199e720bb61d90cd
Signed-off-by: Keith Smith <bksmith@us.ibm.com>

cmd/fabric-ca-server/config.go

@@ -100,7 +100,7 @@ tls:
   # Enable TLS (default: false)
   enabled: false
   # TLS for the server's listening port
-  certfile: tls-cert.pem
+  certfile:
   keyfile:
   clientauth:
     type: noclientcert
@@ -119,12 +119,12 @@ tls:
 ca:
   # Name of this CA
   name:
-  # Key file (default: ca-key.pem)
-  keyfile: ca-key.pem
+  # Key file (is only used to import a private key into BCCSP)
+  keyfile:
   # Certificate file (default: ca-cert.pem)
-  certfile: ca-cert.pem
-  # Chain file (default: chain-cert.pem)
-  chainfile: ca-chain.pem
+  certfile:
+  # Chain file
+  chainfile:
 
 #############################################################################
 #  The gencrl REST endpoint is used to generate a CRL that contains revoked
@@ -190,10 +190,9 @@ db:
   tls:
       enabled: false
       certfiles:
-        - db-server-cert.pem
       client:
-        certfile: db-client-cert.pem
-        keyfile: db-client-key.pem
+        certfile:
+        keyfile:
 
 #############################################################################
 #  LDAP section
@@ -210,10 +209,9 @@ ldap:
    url: ldap://<adminDN>:<adminPassword>@<host>:<port>/<base>
    tls:
       certfiles:
-        - ldap-server-cert.pem
       client:
-         certfile: ldap-client-cert.pem
-         keyfile: ldap-client-key.pem
+         certfile:
+         keyfile:
 
 #############################################################################
 #  Affiliation section

lib/caconfig.go

@@ -102,9 +102,9 @@ type CAConfig struct {
 // CAInfo is the CA information on a fabric-ca-server
 type CAInfo struct {
 	Name      string `opt:"n" help:"Certificate Authority name"`
-	Keyfile   string `def:"ca-key.pem" help:"PEM-encoded CA key file"`
+	Keyfile   string `help:"PEM-encoded CA key file"`
 	Certfile  string `def:"ca-cert.pem" help:"PEM-encoded CA certificate file"`
-	Chainfile string `def:"ca-chain.pem" help:"PEM-encoded CA chain file"`
+	Chainfile string `help:"PEM-encoded CA chain file"`
 }
 
 // CAConfigDB is the database part of the server's config

lib/tls/tls.go

@@ -33,7 +33,7 @@ import (
 // ServerTLSConfig defines key material for a TLS server
 type ServerTLSConfig struct {
 	Enabled    bool   `help:"Enable TLS on the listening port"`
-	CertFile   string `def:"tls-cert.pem" help:"PEM-encoded TLS certificate file for server's listening port"`
+	CertFile   string `help:"PEM-encoded TLS certificate file for server's listening port"`
 	KeyFile    string `help:"PEM-encoded TLS key for server's listening port"`
 	ClientAuth ClientAuth
 }