primal/traefik
1
0
Fork 0
mirror of https://github.com/traefik/traefik synced 2026-02-12 06:18:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.5' into master

Browse Source
This commit is contained in:
Fernandez Ludovic
2018-01-24 11:57:06 +01:00
parent fb4ba7af2b 4afb39778a
commit c8446c2dc8
40 changed files with 493 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/https_test.go
+2 -2
View File
@@ -525,7 +525,7 @@ func (s *HTTPSSuite) TestWithSNIDynamicConfigRouteWithChange(c *check.C) {
c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
}
// TestWithSNIDynamicConfigRouteWithChangeForEmptyTlsConfiguration involves a client sending HTTPS requests with
// TestWithSNIDynamicConfigRouteWithTlsConfigurationDeletion involves a client sending HTTPS requests with
// SNI hostnames of "snitest.org" and "snitest.com". The test verifies
// that traefik updates its configuration when the HTTPS configuration is modified, even if it totally deleted, and
// it routes the requests to the expected backends thanks to given certificate if possible
@@ -624,7 +624,7 @@ func modifyCertificateConfFileContent(c *check.C, certFileName, confFileName, en
// If certificate file is not provided, just truncate the configuration file
if len(certFileName) > 0 {
tlsConf := types.Configuration{
TLSConfiguration: []*traefikTls.Configuration{
TLS: []*traefikTls.Configuration{
{
Certificate: &traefikTls.Certificate{
CertFile: traefikTls.FileOrContent("fixtures/https/" + certFileName + ".cert"),