From ccd919aba3361aec4689ffa1c16ab05d8cc5a8e7 Mon Sep 17 00:00:00 2001
From: Emile Vauge <emile@vauge.com>
Date: Tue, 10 Apr 2018 17:26:04 +0200
Subject: [PATCH 1/2] Fix Azure brand

---
 README.md                                    |  2 +-
 docs/configuration/backends/servicefabric.md | 16 ++++++++--------
 docs/index.md                                |  2 +-
 mkdocs.yml                                   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 7a910885e..73e2c0907 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ _(But if you'd rather configure some of your routes manually, Træfik supports t
 - [Kubernetes](docs/configuration/backends/kubernetes/)
 - [Mesos](docs/configuration/backends/mesos/) / [Marathon](docs/configuration/backends/marathon/)
 - [Rancher](docs/configuration/backends/rancher/) (API, Metadata)
-- [Service Fabric](docs/configuration/backends/servicefabric/)
+- [Azure Service Fabric](docs/configuration/backends/servicefabric/)
 - [Consul Catalog](docs/configuration/backends/consulcatalog/)
 - [Consul](docs/configuration/backends/consul/) / [Etcd](docs/configuration/backends/etcd/) / [Zookeeper](docs/configuration/backends/zookeeper/) / [BoltDB](docs/configuration/backends/boltdb/)
 - [Eureka](docs/configuration/backends/eureka/)
diff --git a/docs/configuration/backends/servicefabric.md b/docs/configuration/backends/servicefabric.md
index b87a92675..aa526e48d 100644
--- a/docs/configuration/backends/servicefabric.md
+++ b/docs/configuration/backends/servicefabric.md
@@ -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)
 
-## Service Fabric
+## Azure Service Fabric
 
 ```toml
 ################################################################
-# Service Fabric provider
+# Azure Service Fabric provider
 ################################################################
 
-# Enable Service Fabric configuration backend
+# Enable Azure Service Fabric configuration backend
 [serviceFabric]
 
-# Service Fabric Management Endpoint
+# Azure Service Fabric Management Endpoint
 #
 # Required
 #
 clusterManagementUrl = "https://localhost:19080"
 
-# Service Fabric Management Endpoint API Version
+# Azure Service Fabric Management Endpoint API Version
 #
 # Required
 # Default: "3.0"
 #
 apiVersion = "3.0"
 
-# Service Fabric Polling Interval (in seconds)
+# Azure Service Fabric Polling Interval (in seconds)
 #
 # Required
 # Default: 10
diff --git a/docs/index.md b/docs/index.md
index 00d2c30d9..74670839d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -52,7 +52,7 @@ _(But if you'd rather configure some of your routes manually, Træfik supports t
 - [Kubernetes](/configuration/backends/kubernetes/)
 - [Mesos](/configuration/backends/mesos/) / [Marathon](/configuration/backends/marathon/)
 - [Rancher](/configuration/backends/rancher/) (API, Metadata)
-- [Service Fabric](/configuration/backends/servicefabric/)
+- [Azure Service Fabric](/configuration/backends/servicefabric/)
 - [Consul Catalog](/configuration/backends/consulcatalog/)
 - [Consul](/configuration/backends/consul/) / [Etcd](/configuration/backends/etcd/) / [Zookeeper](/configuration/backends/zookeeper/) / [BoltDB](/configuration/backends/boltdb/)
 - [Eureka](/configuration/backends/eureka/)
diff --git a/mkdocs.yml b/mkdocs.yml
index e7a10747f..657408b88 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -83,7 +83,7 @@ pages:
     - 'Backend: Mesos': 'configuration/backends/mesos.md'
     - 'Backend: Rancher': 'configuration/backends/rancher.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'
     - 'API / Dashboard': 'configuration/api.md'
     - 'Ping': 'configuration/ping.md'

From 2641832304c2c168d19649a97135d3f5c3009c44 Mon Sep 17 00:00:00 2001
From: Manuel Zapf <manuel.laufenberg@googlemail.com>
Date: Wed, 11 Apr 2018 10:36:03 +0200
Subject: [PATCH 2/2] Default certificate expiry

---
 tls/generate/generate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tls/generate/generate.go b/tls/generate/generate.go
index 842327dab..1723d7e37 100644
--- a/tls/generate/generate.go
+++ b/tls/generate/generate.go
@@ -71,7 +71,7 @@ func derCert(privKey *rsa.PrivateKey, expiration time.Time, domain string) ([]by
 	}
 
 	if expiration.IsZero() {
-		expiration = time.Now().Add(365)
+		expiration = time.Now().Add(365 * (24 * time.Hour))
 	}
 
 	template := x509.Certificate{