From cdee810942e5fed33f2339e427e3edec8e015d9e Mon Sep 17 00:00:00 2001 From: Diogo Monica Date: Wed, 15 Jul 2015 19:45:34 -0700 Subject: [PATCH] Changed notary-server to point at new certs Signed-off-by: Diogo Monica --- cmd/notary-server/README.md | 4 ++-- cmd/notary-server/config.json | 6 +++--- cmd/notary-server/dev-config.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/notary-server/README.md b/cmd/notary-server/README.md index a3cb1d642a..b88cb34ef8 100644 --- a/cmd/notary-server/README.md +++ b/cmd/notary-server/README.md @@ -57,8 +57,8 @@ The configuration file must be a json file with the following format: { "server": { "addr": ":4443", - "tls_cert_file": "./fixtures/notary.pem", - "tls_key_file": "./fixtures/notary.key" + "tls_cert_file": "./fixtures/notary-server.pem", + "tls_key_file": "./fixtures/notary-server.key" }, "logging": { "level": 5 diff --git a/cmd/notary-server/config.json b/cmd/notary-server/config.json index 8d0bed1a3b..4f9e9b1a30 100644 --- a/cmd/notary-server/config.json +++ b/cmd/notary-server/config.json @@ -1,14 +1,14 @@ { "server": { "addr": ":4443", - "tls_cert_file": "./fixtures/notary.pem", - "tls_key_file": "./fixtures/notary.key" + "tls_cert_file": "./fixtures/notary-server.pem", + "tls_key_file": "./fixtures/notary-server.key" }, "trust_service": { "type": "local", "hostname": "signer", "port": "7899", - "tls_ca_file": "./fixtures/ca.cert" + "tls_ca_file": "./fixtures/root-ca.crt" }, "logging": { "level": 5 diff --git a/cmd/notary-server/dev-config.json b/cmd/notary-server/dev-config.json index ae4a61ab68..125f6238bc 100644 --- a/cmd/notary-server/dev-config.json +++ b/cmd/notary-server/dev-config.json @@ -1,8 +1,8 @@ { "server": { "addr": ":4443", - "tls_key_file": "/go/src/github.com/docker/notary/fixtures/notary.key", - "tls_cert_file": "/go/src/github.com/docker/notary/fixtures/notary.pem" + "tls_key_file": "/go/src/github.com/docker/notary/fixtures/notary-server.key", + "tls_cert_file": "/go/src/github.com/docker/notary/fixtures/notary-signer.pem" }, "trust_service": { "type": "local",