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

Merge branch 'v1.5' into 'v1.6'

Browse source
This commit is contained in:
Fernandez Ludovic 2018-04-11 14:20:53 +02:00
parent c99266e961 2641832304
commit edbcd01fbc
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -74,7 +74,7 @@ _(But if you'd rather configure some of your routes manually, Træfik supports t
- [Kubernetes](https://docs.traefik.io/configuration/backends/kubernetes) - [Kubernetes](https://docs.traefik.io/configuration/backends/kubernetes)
- [Mesos](https://docs.traefik.io/configuration/backends/mesos) / [Marathon](https://docs.traefik.io/configuration/backends/marathon) - [Mesos](https://docs.traefik.io/configuration/backends/mesos) / [Marathon](https://docs.traefik.io/configuration/backends/marathon)
- [Rancher](https://docs.traefik.io/configuration/backends/rancher) (API, Metadata) - [Rancher](https://docs.traefik.io/configuration/backends/rancher) (API, Metadata)
- [Service Fabric](https://docs.traefik.io/configuration/backends/servicefabric) - [Azure Service Fabric](https://docs.traefik.io/configuration/backends/servicefabric)
- [Consul Catalog](https://docs.traefik.io/configuration/backends/consulcatalog) - [Consul Catalog](https://docs.traefik.io/configuration/backends/consulcatalog)
- [Consul](https://docs.traefik.io/configuration/backends/consul) / [Etcd](https://docs.traefik.io/configuration/backends/etcd) / [Zookeeper](https://docs.traefik.io/configuration/backends/zookeeper) / [BoltDB](https://docs.traefik.io/configuration/backends/boltdb) - [Consul](https://docs.traefik.io/configuration/backends/consul) / [Etcd](https://docs.traefik.io/configuration/backends/etcd) / [Zookeeper](https://docs.traefik.io/configuration/backends/zookeeper) / [BoltDB](https://docs.traefik.io/configuration/backends/boltdb)
- [Eureka](https://docs.traefik.io/configuration/backends/eureka) - [Eureka](https://docs.traefik.io/configuration/backends/eureka)

16
docs/configuration/backends/servicefabric.md
View file

@ -1,33 +1,33 @@
# Service Fabric Backend # Azure Service Fabric Backend
Træfik can be configured to use Service Fabric as a backend configuration. Træfik can be configured to use Azure Service Fabric as a backend configuration.
See [this repository for an example deployment package and further documentation.](https://aka.ms/traefikonsf) See [this repository for an example deployment package and further documentation.](https://aka.ms/traefikonsf)
## Service Fabric ## Azure Service Fabric
```toml ```toml
################################################################ ################################################################
# Service Fabric provider # Azure Service Fabric provider
################################################################ ################################################################
# Enable Service Fabric configuration backend # Enable Azure Service Fabric configuration backend
[serviceFabric] [serviceFabric]
# Service Fabric Management Endpoint # Azure Service Fabric Management Endpoint
# #
# Required # Required
# #
clusterManagementUrl = "https://localhost:19080" clusterManagementUrl = "https://localhost:19080"
# Service Fabric Management Endpoint API Version # Azure Service Fabric Management Endpoint API Version
# #
# Required # Required
# Default: "3.0" # Default: "3.0"
# #
apiVersion = "3.0" apiVersion = "3.0"
# Service Fabric Polling Interval (in seconds) # Azure Service Fabric Polling Interval (in seconds)
# #
# Required # Required
# Default: 10 # Default: 10

2
docs/index.md
View file

@ -52,7 +52,7 @@ _(But if you'd rather configure some of your routes manually, Træfik supports t
- [Kubernetes](/configuration/backends/kubernetes/) - [Kubernetes](/configuration/backends/kubernetes/)
- [Mesos](/configuration/backends/mesos/) / [Marathon](/configuration/backends/marathon/) - [Mesos](/configuration/backends/mesos/) / [Marathon](/configuration/backends/marathon/)
- [Rancher](/configuration/backends/rancher/) (API, Metadata) - [Rancher](/configuration/backends/rancher/) (API, Metadata)
- [Service Fabric](/configuration/backends/servicefabric/) - [Azure Service Fabric](/configuration/backends/servicefabric/)
- [Consul Catalog](/configuration/backends/consulcatalog/) - [Consul Catalog](/configuration/backends/consulcatalog/)
- [Consul](/configuration/backends/consul/) / [Etcd](/configuration/backends/etcd/) / [Zookeeper](/configuration/backends/zookeeper/) / [BoltDB](/configuration/backends/boltdb/) - [Consul](/configuration/backends/consul/) / [Etcd](/configuration/backends/etcd/) / [Zookeeper](/configuration/backends/zookeeper/) / [BoltDB](/configuration/backends/boltdb/)
- [Eureka](/configuration/backends/eureka/) - [Eureka](/configuration/backends/eureka/)

2
mkdocs.yml
View file

@ -84,7 +84,7 @@ pages:
- 'Backend: Mesos': 'configuration/backends/mesos.md' - 'Backend: Mesos': 'configuration/backends/mesos.md'
- 'Backend: Rancher': 'configuration/backends/rancher.md' - 'Backend: Rancher': 'configuration/backends/rancher.md'
- 'Backend: Rest': 'configuration/backends/rest.md' - 'Backend: Rest': 'configuration/backends/rest.md'
- 'Backend: Service Fabric': 'configuration/backends/servicefabric.md' - 'Backend: Azure Service Fabric': 'configuration/backends/servicefabric.md'
- 'Backend: Zookeeper': 'configuration/backends/zookeeper.md' - 'Backend: Zookeeper': 'configuration/backends/zookeeper.md'
- 'API / Dashboard': 'configuration/api.md' - 'API / Dashboard': 'configuration/api.md'
- 'Ping': 'configuration/ping.md' - 'Ping': 'configuration/ping.md'

2
tls/generate/generate.go
View file

@ -72,7 +72,7 @@ func derCert(privKey *rsa.PrivateKey, expiration time.Time, domain string) ([]by
} }
if expiration.IsZero() { if expiration.IsZero() {
expiration = time.Now().Add(365) expiration = time.Now().Add(365 * (24 * time.Hour))
} }
template := x509.Certificate{ template := x509.Certificate{