baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enhance entry point TLS CLI reference.

Browse source
This commit is contained in:
Ludovic Fernandez 2018-05-13 17:12:03 +02:00 committed by Traefiker Bot
parent 8fcd242494
commit c5db8d903c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configuration/entrypoints_test.go
View file

@ -170,7 +170,7 @@ func TestEntryPoints_Set(t *testing.T) {
name: "all parameters camelcase", name: "all parameters camelcase",
expression: "Name:foo " + expression: "Name:foo " +
"Address::8000 " + "Address::8000 " +
"TLS:goo,gii " + "TLS:goo,gii;foo,fii " +
"TLS " + "TLS " +
"CA:car " + "CA:car " +
"CA.Optional:true " + "CA.Optional:true " +
@ -203,6 +203,10 @@ func TestEntryPoints_Set(t *testing.T) {
CertFile: tls.FileOrContent("goo"), CertFile: tls.FileOrContent("goo"),
KeyFile: tls.FileOrContent("gii"), KeyFile: tls.FileOrContent("gii"),
}, },
{
CertFile: tls.FileOrContent("foo"),
KeyFile: tls.FileOrContent("fii"),
},
}, },
ClientCA: tls.ClientCA{ ClientCA: tls.ClientCA{
Files: []string{"car"}, Files: []string{"car"},
@ -272,7 +276,7 @@ func TestEntryPoints_Set(t *testing.T) {
name: "all parameters lowercase", name: "all parameters lowercase",
expression: "Name:foo " + expression: "Name:foo " +
"address::8000 " + "address::8000 " +
"tls:goo,gii " + "tls:goo,gii;foo,fii " +
"tls " + "tls " +
"ca:car " + "ca:car " +
"ca.Optional:true " + "ca.Optional:true " +
@ -303,6 +307,10 @@ func TestEntryPoints_Set(t *testing.T) {
CertFile: tls.FileOrContent("goo"), CertFile: tls.FileOrContent("goo"),
KeyFile: tls.FileOrContent("gii"), KeyFile: tls.FileOrContent("gii"),
}, },
{
CertFile: tls.FileOrContent("foo"),
KeyFile: tls.FileOrContent("fii"),
},
}, },
ClientCA: tls.ClientCA{ ClientCA: tls.ClientCA{
Files: []string{"car"}, Files: []string{"car"},

2
docs/configuration/entrypoints.md
View file

@ -106,7 +106,7 @@ traefik:
```ini ```ini
Name:foo Name:foo
Address::80 Address::80
TLS:goo,gii TLS:/my/path/foo.cert,/my/path/foo.key;/my/path/goo.cert,/my/path/goo.key;/my/path/hoo.cert,/my/path/hoo.key
TLS TLS
CA:car CA:car
CA.Optional:true CA.Optional:true