baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
2429 commits 1 branch 0 tags 84 MiB
Commit graph

2429 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
9a26e0db16 Merge pull request #610 from containous/merge-v1.0.2-master 
Merge v1.0.2 master
 2016-09-19 20:29:37 +02:00
Emile Vauge
efe6989fd3
Merge acme from v1.0.2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-19 19:58:34 +02:00
Emile Vauge
aa1c9b80e3
Prepare release v1.0.2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-19 16:49:21 +02:00
Emile Vauge
6981df3b9a
Fix ACME TOS 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-19 16:49:21 +02:00
Emile Vauge
0d1ed625a8
Bump oxy version, fix streaming 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-19 16:49:21 +02:00
Emile Vauge
710fc56c6a Merge pull request #677 from SantoDE/master 
Add basic auth support for web backend
 2016-09-19 16:48:05 +02:00
Manuel Laufenberg
d5a15d6756 add basic auth support 
implemented requested changes

fix docs

remove struct tag
 2016-09-19 09:40:43 +02:00
Emile Vauge
b376da1829 Merge pull request #645 from jangie/add-backend-features-to-consul-catalog 
enable consul catalog to use maxconn
 2016-09-15 18:46:30 +02:00
Bruce Lee
f7f17f0057 enable consul catalog to use maxconn 2016-09-15 12:11:37 -04:00
Emile Vauge
d06b9c2992 Merge pull request #616 from jangie/master 
Add ability for marathon provider to set maxconn values, loadbalancer algorithm, and circuit breaker expression
 2016-09-15 17:19:12 +02:00
Bruce Lee
99ca5d0a03 Add ability for marathon provider to set maxconn values 
Initial implementation: Force both to be present to trigger behavior.

add ability to see rendered template in debug

add support for loadbalancer and circuit breaker specification

add documentation for new configuration
 2016-09-14 16:52:02 -04:00
Vincent Demeester
4783c7f70a Merge pull request #646 from jangie/add-backend-features-to-docker 
Add backend features to docker
 2016-09-14 22:48:59 +02:00
Bruce Lee
d89bdfbd27 Add backend features to docker 2016-09-14 14:51:31 -04:00
Diogo Gomes
1e324ad3bc If Marathon doesn't have healthcheck, assume it's ok (#665) 
Healthcheck are not mandatory, so if a result is not present, assume it
is ok to continue. Fixes the case when a new leader is elected and
don't have any healthcheck result's, returning 404 to all requests.
https://github.com/containous/traefik/issues/653
 2016-09-14 17:44:37 +02:00
Emile Vauge
52737e91e5 Merge pull request #660 from JayH5/acme-renew-30-days 
ACME: renew certificates 30 days before expiry
 2016-09-14 08:01:07 +02:00
Jamie Hewland
1872e2b63d ACME: renew certificates 30 days before expiry, like the official certbot client 2016-09-13 16:15:58 +02:00
Martijn Heemels
3c5605b793 Update broken link in sample config file. (#658) 2016-09-13 15:17:34 +02:00
Vincent Demeester
9a2b7cf5be Merge pull request #668 from yvespp/master 
Kubernetes provider: traefik.frontend.rule.type logging
 2016-09-13 10:56:20 +02:00
Yves Peter
1a20e9f9b4 Kubernetes provider: don't log a warning if traefik.frontend.rule.type is empty, log namespace and ingress if invalide. 2016-09-12 21:06:21 +02:00
Vincent Demeester
14d79e4eef Merge pull request #641 from errm/code-of-conduct 
Adopt the Code Of Coduct from http://contributor-covenant.org
 2016-08-30 22:26:29 +02:00
Ed Robinson
71f48d2aef
Adopt the Code Of Coduct from http://contributor-covenant.org 2016-08-26 10:26:41 +01:00
Emile Vauge
312adca226 Merge pull request #630 from jangie/add-ping-handler 
add PING handler to dashboard API
 2016-08-25 23:10:26 +02:00
Bruce Lee
d35c6e77d7 add PING handler to dashboard API 2016-08-24 21:37:12 -04:00
Emile Vauge
1de21c86ae Merge pull request #639 from discordianfish/fish/fix-acme-perm 
Use secure mode 600 instead of 644 for acme.json
 2016-08-24 20:06:33 +02:00
Johannes 'fish' Ziemke
c709a592eb Use secure mode 600 instead of 644 for acme.json 2016-08-22 13:33:49 +02:00
Vincent Demeester
a54c544eb4 Merge pull request #637 from djalal/patch-1 
docker clarification, fix dead urls, misc typos
 2016-08-22 13:06:35 +02:00
djalal
7d936ec6aa docker clarification, fix dead urls, misc typos 2016-08-22 11:03:34 +02:00
Emile Vauge
f63ec1332f Merge pull request #628 from containous/mirgate-to-JobBackOff 
Migrate to JobBackOff
 2016-08-19 22:24:39 +02:00
Emile Vauge
d340ccd601
Migrate to JobBackOff 2016-08-19 14:24:09 +02:00
Vincent Demeester
95e8f0a31e Merge pull request #627 from containous/add-long-job-exponential-backoff 
Add long job exponential backoff
 2016-08-19 11:40:16 +02:00
Emile Vauge
97ddfcb17a
Use long job RetryBackoff in providers 2016-08-19 11:09:54 +02:00
Emile Vauge
7bb5f9a1e4
Add long job RetryBackoff 2016-08-19 11:09:34 +02:00
Emile Vauge
11297b38c5
Remove misused Fatal* 2016-08-19 10:36:54 +02:00
Emile Vauge
fc19ab2868 Merge pull request #601 from containous/add-host-cert-acme-generation 
Add Host cert ACME generation
 2016-08-18 15:01:41 +02:00
Emile Vauge
5e01c0a7db
Add Host cert ACME generation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-08-18 14:20:55 +02:00
Vincent Demeester
f1c3d820f7 Merge pull request #617 from jangie/fix-nil-client-tls 
fix for nil clientTLS causing issue
 2016-08-17 09:46:17 +02:00
Bruce Lee
0757a75732 fix for nil clientTLS causing issue 2016-08-16 17:50:22 -04:00
Emile Vauge
f0ea45a0f8 Merge pull request #613 from keis/installable-systemd-unit 
Make systemd unit installable
 2016-08-16 15:11:59 +02:00
David Keijser
45f2335a60 Make systemd unit installable 
Having a install section makes it possible to enable/disable traefik
using the standard systemd commands

`systemctl enable traefik`
`systemctl disable traefk`
 2016-08-16 14:50:20 +02:00
Vincent Demeester
d629939cf3 Merge pull request #620 from containous/bump-go-1.7 
Bump go v1.7
 2016-08-16 12:58:11 +02:00
Emile Vauge
404f76dcb9
Bump go v1.7 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-08-16 11:11:47 +02:00
Vincent Demeester
498ce6b00c Merge pull request #573 from errm/fix-k8s-watch 
Fix k8s watch
 2016-08-16 09:32:50 +02:00
Ed Robinson
e3a8fd116d
Don't filter the endpoint and service watches 
We added the ability to filter the ingresses used by traefik based
on a label selector, but we shouldn't need to have matching
labels on every other resource, Ingress allready has a way
to explicty choose which pods end up in the load ballancer
(by refering to the membership of a particular service)
 2016-08-16 06:50:50 +01:00
Ed Robinson
d33e09bcf3
Ignore .DS_Store (Mac junk) 2016-08-16 06:50:50 +01:00
Vincent Demeester
fb3bad3887 Merge pull request #619 from jangie/consistent-duration-logging 
Make duration logging consistent
 2016-08-15 18:30:25 +02:00
Bruce Lee
3a736ad4a8 Make duration logging consistent 
GH #559 points out that the logging of the elapsed time is inconsistent
depending on the scale of the measured time; this is due to Duration’s
String handling.

With this PR, I propose that traefik logs millis, and not fractions of
millis.
 2016-08-15 08:43:20 -04:00
Vincent Demeester
c1b0c41769 Merge pull request #609 from cocap10/update-staert-toml-default-pointer-behaviour 
update staert and flaeg
 2016-08-15 13:19:24 +02:00
Martin
c03274703e update staert and flaeg 2016-08-11 14:34:33 +02:00
Christian Winther
4cd08e88f6 Fix Consul prefix (#589) 
Seemed to have been the cause of #587
 2016-08-08 11:53:00 +02:00
Vincent Demeester
e2c4872030 Merge pull request #596 from errm/k8s-server-naming 
Name servers after thier pods
 2016-08-07 09:21:44 +02:00