docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changing .pem to .crt everywhere 

Signed-off-by: Diogo Monica <diogo@docker.com>
This commit is contained in:
Diogo Monica 2015-07-15 20:44:09 -07:00
parent 3d58e6b810
commit ddfcd50471
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/notary-server/README.md
View File

@ -57,7 +57,7 @@ The configuration file must be a json file with the following format:
{
"server": {
"addr": ":4443",
"tls_cert_file": "./fixtures/notary-server.pem",
"tls_cert_file": "./fixtures/notary-server.crt",
"tls_key_file": "./fixtures/notary-server.key"
},
"logging": {

2
cmd/notary-server/config.json
View File

@ -1,7 +1,7 @@
{
"server": {
"addr": ":4443",
"tls_cert_file": "./fixtures/notary-server.pem",
"tls_cert_file": "./fixtures/notary-server.crt",
"tls_key_file": "./fixtures/notary-server.key"
},
"trust_service": {

2
cmd/notary-server/dev-config.json
View File

@ -2,7 +2,7 @@
"server": {
"addr": ":4443",
"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"
"tls_cert_file": "/go/src/github.com/docker/notary/fixtures/notary-signer.crt"
},
"trust_service": {
"type": "local",

4
notary-signer-Dockerfile
View File

@ -25,5 +25,5 @@ RUN go install github.com/docker/notary/cmd/notary-signer
EXPOSE 4443
#ENTRYPOINT notary-signer -cert /go/src/github.com/docker/notary/fixtures/notary-signer.pem -key /go/src/github.com/docker/notary/fixtures/notary-signer.key -debug -pkcs11 /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so -pin 123456
ENTRYPOINT notary-signer -cert /go/src/github.com/docker/notary/fixtures/notary-signer.pem -key /go/src/github.com/docker/notary/fixtures/notary-signer.key -debug -pkcs11 $LIBDIR/libsofthsm2.so -pin 1234
#ENTRYPOINT notary-signer -cert /go/src/github.com/docker/notary/fixtures/notary-signer.crt -key /go/src/github.com/docker/notary/fixtures/notary-signer.key -debug -pkcs11 /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so -pin 123456
ENTRYPOINT notary-signer -cert /go/src/github.com/docker/notary/fixtures/notary-signer.crt -key /go/src/github.com/docker/notary/fixtures/notary-signer.key -debug -pkcs11 $LIBDIR/libsofthsm2.so -pin 1234

8
server/server_test.go
View File

@ -14,8 +14,8 @@ func TestRunBadAddr(t *testing.T) {
err := Run(
context.Background(),
"testAddr",
"../fixtures/notary-server.pem",
"../fixtures/notary-server.key",
"../fixtures/notary-server.crt",
"../fixtures/notary-server.crt",
signed.NewEd25519(),
"",
nil,
@ -31,8 +31,8 @@ func TestRunReservedPort(t *testing.T) {
err := Run(
ctx,
"localhost:80",
"../fixtures/notary-server.pem",
"../fixtures/notary-server.key",
"../fixtures/notary-server.crt",
"../fixtures/notary-server.crt",
signed.NewEd25519(),
"",
nil,