homelab/traefik
1
0
Fork 0
Code Activity

Merge branch '1.5.0-rc5' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2018-01-15 17:27:37 +01:00
commit 89d90de7d8
74 changed files with 914 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

20
integration/acme_test.go
View file

@ -72,6 +72,26 @@ func (s *AcmeSuite) TestOnHostRuleRetrieveAcmeCertificate(c *check.C) {
s.retrieveAcmeCertificate(c, testCase)
}
// Test OnDemand option with none provided certificate and challenge HTTP-01
func (s *AcmeSuite) TestOnDemandRetrieveAcmeCertificateHTTP01(c *check.C) {
testCase := AcmeTestCase{
traefikConfFilePath: "fixtures/acme/acme_http01.toml",
onDemand: true,
domainToCheck: acmeDomain}
s.retrieveAcmeCertificate(c, testCase)
}
// Test OnHostRule option with none provided certificate and challenge HTTP-01
func (s *AcmeSuite) TestOnHostRuleRetrieveAcmeCertificateHTTP01(c *check.C) {
testCase := AcmeTestCase{
traefikConfFilePath: "fixtures/acme/acme_http01.toml",
onDemand: false,
domainToCheck: acmeDomain}
s.retrieveAcmeCertificate(c, testCase)
}
// Test OnDemand option with a wildcard provided certificate
func (s *AcmeSuite) TestOnDemandRetrieveAcmeCertificateWithWildcard(c *check.C) {
testCase := AcmeTestCase{

7
integration/consul_test.go
View file

@ -294,7 +294,10 @@ func (s *ConsulSuite) skipTestGlobalConfigurationWithClientTLS(c *check.C) {
s.setupConsulTLS(c)
consulHost := s.composeProject.Container(c, "consul").NetworkSettings.IPAddress
err := s.kv.Put("traefik/web/address", []byte(":8081"), nil)
err := s.kv.Put("traefik/api/entrypoint", []byte("api"), nil)
c.Assert(err, checker.IsNil)
err = s.kv.Put("traefik/entrypoints/api/address", []byte(":8081"), nil)
c.Assert(err, checker.IsNil)
// wait for consul
@ -341,7 +344,7 @@ func (s *ConsulSuite) TestCommandStoreConfig(c *check.C) {
"/traefik/loglevel": "DEBUG",
"/traefik/defaultentrypoints/0": "http",
"/traefik/entrypoints/http/address": ":8000",
"/traefik/web/address": ":8080",
"/traefik/api/entrypoint": "traefik",
"/traefik/consul/endpoint": consulHost + ":8500",
}

2
integration/etcd3_test.go
View file

@ -411,7 +411,7 @@ func (s *Etcd3Suite) TestCommandStoreConfig(c *check.C) {
"/traefik/loglevel": "DEBUG",
"/traefik/defaultentrypoints/0": "http",
"/traefik/entrypoints/http/address": ":8000",
"/traefik/web/address": ":8080",
"/traefik/api/entrypoint": "traefik",
"/traefik/etcd/endpoint": ipEtcd + ":4001",
}

2
integration/etcd_test.go
View file

@ -419,7 +419,7 @@ func (s *EtcdSuite) TestCommandStoreConfig(c *check.C) {
"/traefik/loglevel": "DEBUG",
"/traefik/defaultentrypoints/0": "http",
"/traefik/entrypoints/http/address": ":8000",
"/traefik/web/address": ":8080",
"/traefik/api/entrypoint": "traefik",
"/traefik/etcd/endpoint": etcdHost + ":4001",
}

35
integration/fixtures/acme/acme_http01.toml Normal file
View file

@ -0,0 +1,35 @@
logLevel = "DEBUG"
defaultEntryPoints = ["http", "https"]
[entryPoints]
[entryPoints.http]
address = ":5002"
[entryPoints.https]
address = ":5001"
[entryPoints.https.tls]
[acme]
email = "test@traefik.io"
storage = "/dev/null"
entryPoint = "https"
onDemand = {{.OnDemand}}
OnHostRule = {{.OnHostRule}}
caServer = "http://{{.BoulderHost}}:4000/directory"
[acme.httpchallenge]
entrypoint="http"
[file]
[backends]
[backends.backend]
[backends.backend.servers.server1]
url = "http://127.0.0.1:9010"
[frontends]
[frontends.frontend]
backend = "backend"
[frontends.frontend.routes.test]
rule = "Host:traefik.acme.wtf"

6
integration/fixtures/consul/simple.toml
View file

@ -5,6 +5,8 @@ logLevel = "DEBUG"
[entryPoints]
[entryPoints.http]
address = ":8000"
[entryPoints.api]
address = ":8081"
[consul]
@ -12,5 +14,5 @@ logLevel = "DEBUG"
watch = true
prefix = "traefik"
[web]
address = ":8081"
[api]
entryPoint = "api"

6
integration/fixtures/consul/simple_https.toml
View file

@ -3,6 +3,8 @@ defaultEntryPoints = ["http","https"]
logLevel = "DEBUG"
[entryPoints]
[entryPoints.api]
address = ":8081"
[entryPoints.http]
address = ":8000"
[entryPoints.https]
@ -16,5 +18,5 @@ logLevel = "DEBUG"
prefix = "traefik"
watch = true
[web]
address = ":8081"
[api]
entryPoint = "api"

3
integration/fixtures/consul_catalog/simple.toml
View file

@ -1,8 +1,7 @@
defaultEntryPoints = ["http"]
logLevel = "DEBUG"
[web]
address = ":8080"
[api]
[entryPoints]
[entryPoints.http]

2
integration/fixtures/docker/simple.toml
View file

@ -6,7 +6,7 @@ logLevel = "DEBUG"
[entryPoints.http]
address = ":8000"
[web]
[api]
[docker]

6
integration/fixtures/dynamodb/simple.toml
View file

@ -5,6 +5,8 @@ logLevel = "DEBUG"
[entryPoints]
[entryPoints.http]
address = ":8080"
[entryPoints.api]
address = ":8081"
[dynamodb]
AccessKeyID = "key"
@ -12,5 +14,5 @@ logLevel = "DEBUG"
Endpoint = "{{.DynamoURL}}"
Region = "us-east-1"
[web]
address = ":8081"
[api]
entryPoint = "api"

6
integration/fixtures/etcd/simple.toml
View file

@ -5,6 +5,8 @@ logLevel = "DEBUG"
[entryPoints]
[entryPoints.http]
address = ":8000"
[entryPoints.api]
address = ":8081"
[etcd]
@ -13,5 +15,5 @@ logLevel = "DEBUG"
watch = true
useAPIV3 = {{.UseAPIV3}}
[web]
address = ":8081"
[api]
entryPoint = "api"

7
integration/fixtures/etcd/simple_https.toml
View file

@ -3,6 +3,8 @@ defaultEntryPoints = ["http","https"]
logLevel = "DEBUG"
[entryPoints]
[entryPoints.api]
address = ":8081"
[entryPoints.http]
address = ":8000"
[entryPoints.https]
@ -16,5 +18,6 @@ logLevel = "DEBUG"
# prefix = "/traefik"
# watch = true
[web]
address = ":8081"
[api]
entryPoint = "api"

3
integration/fixtures/eureka/simple.toml
View file

@ -10,5 +10,4 @@ logLevel = "DEBUG"
[eureka]
endpoint = "http://{{.EurekaHost}}:8761/eureka"
delay = "1s"
[web]
address = ":8080"
[api]

3
integration/fixtures/grpc/config.toml
View file

@ -11,8 +11,7 @@ RootCAs = [ """{{ .CertContent }}""" ]
keyFile = """{{ .KeyContent }}"""
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/grpc/config_insecure.toml
View file

@ -11,8 +11,7 @@ InsecureSkipVerify = true
keyFile = """{{ .KeyContent }}"""
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
View file

@ -8,8 +8,7 @@ logLevel = "DEBUG"
[entryPoints.http2]
address = ":9000"
[web]
address = ":8080"
[api]
[file]
[backends]

3
integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
View file

@ -8,8 +8,7 @@ logLevel = "DEBUG"
[entryPoints.http2]
address = ":9000"
[web]
address = ":8080"
[api]
[file]
[backends]

3
integration/fixtures/healthcheck/port_overload.toml
View file

@ -6,8 +6,7 @@ logLevel = "DEBUG"
[entryPoints.http]
address = ":8000"
[web]
address = ":8080"
[api]
[file]
[backends]

3
integration/fixtures/healthcheck/simple.toml
View file

@ -6,8 +6,7 @@ logLevel = "DEBUG"
[entryPoints.http]
address = ":8000"
[web]
address = ":8080"
[api]
[file]
[backends]

3
integration/fixtures/https/clientca/https_1ca1config.toml
View file

@ -16,8 +16,7 @@ defaultEntryPoints = ["https"]
certFile = "fixtures/https/snitest.org.cert"
keyFile = "fixtures/https/snitest.org.key"
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/https/clientca/https_2ca1config.toml
View file

@ -15,8 +15,7 @@ defaultEntryPoints = ["https"]
certFile = "fixtures/https/snitest.org.cert"
keyFile = "fixtures/https/snitest.org.key"
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/https/clientca/https_2ca2config.toml
View file

@ -16,8 +16,7 @@ defaultEntryPoints = ["https"]
certFile = "fixtures/https/snitest.org.cert"
keyFile = "fixtures/https/snitest.org.key"
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/https/dynamic_https_sni.toml
View file

@ -10,8 +10,7 @@ defaultEntryPoints = ["https"]
address = ":8443"
[entryPoints.https02.tls]
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/https/https_sni.toml
View file

@ -13,8 +13,7 @@ defaultEntryPoints = ["https"]
certFile = "fixtures/https/snitest.org.cert"
keyFile = "fixtures/https/snitest.org.key"
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/https/rootcas/https.toml
View file

@ -24,8 +24,7 @@ fblo6RBxUQ==
[entryPoints.http]
address = ":8081"
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/https/rootcas/https_with_file.toml
View file

@ -9,8 +9,7 @@ RootCAs = [ "fixtures/https/rootcas/local.crt"]
[entryPoints.http]
address = ":8081"
[web]
address = ":8080"
[api]
[file]

8
integration/fixtures/log_rotation_config.toml
View file

@ -8,14 +8,16 @@ defaultEntryPoints = ["http"]
[entryPoints]
[entryPoints.http]
address = ":8000"
[entryPoints.api]
address = ":7888"
checkNewVersion = false
################################################################
# Web configuration backend
# Api configuration backend
################################################################
[web]
address = ":7888"
[api]
entryPoint = "api"
################################################################
# File configuration backend

6
integration/fixtures/marathon/simple.toml
View file

@ -5,9 +5,11 @@ logLevel = "DEBUG"
[entryPoints]
[entryPoints.http]
address = ":8000"
[entryPoints.api]
address = ":9090"
[web]
address = ":9090"
[api]
entryPoint = "api"
[marathon]
endpoint = "{{.MarathonURL}}"

3
integration/fixtures/proxy-protocol/with.toml
View file

@ -7,8 +7,7 @@ address = ":8000"
[entryPoints.http.proxyProtocol]
trustedIPs = ["{{.HaproxyIP}}"]
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/proxy-protocol/without.toml
View file

@ -7,8 +7,7 @@ address = ":8000"
[entryPoints.http.proxyProtocol]
trustedIPs = ["1.2.3.4"]
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/simple_web.toml
View file

@ -5,5 +5,4 @@ defaultEntryPoints = ["http"]
[entryPoints.http]
address = ":8000"
[web]
address = ":8080"
[api]

3
integration/fixtures/timeout/forwarding_timeouts.toml
View file

@ -8,8 +8,7 @@ defaultEntryPoints = ["http"]
[accessLog]
format = "json"
[web]
address = ":8080"
[api]
[forwardingTimeouts]
dialTimeout = "300ms"

3
integration/fixtures/websocket/config.toml
View file

@ -7,8 +7,7 @@ logLevel = "DEBUG"
address = ":8000"
[web]
address = ":8080"
[api]
[file]

3
integration/fixtures/websocket/config_https.toml
View file

@ -11,8 +11,7 @@ InsecureSkipVerify=true
certFile = "resources/tls/local.cert"
keyFile = "resources/tls/local.key"
[web]
address = ":8080"
[api]
[file]

5
integration/resources/compose/addprefix.yml Normal file
View file

@ -0,0 +1,5 @@
whoami1:
image: emilevauge/whoami
labels:
- traefik.enable=true
- traefik.frontend.rule=AddPrefix:/whoami;PathPrefix:/