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

4860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
067f13b61c Merge pull request #690 from dtomcej/disable-tls10 
Selectable TLS Versions
 2016-09-28 23:52:34 +02:00
Daniel Tomcej
e249983c77 add TLS Min Version 
silly copy paste
Add cipher selection

add TLS Min Version

silly copy paste

silly copy paste

add TLS Min Version

silly copy paste

fix formatting

Add cipher selection

linted

arg

update cipher map
 2016-09-27 14:29:36 -06:00
Emile Vauge
454b191370 Merge pull request #687 from containous/some-fixes 
Some fixes
 2016-09-27 22:21:59 +02:00
Emile Vauge
a882a9d79f
Fix constraints and add doc 2016-09-27 21:45:29 +02:00
Emile Vauge
89fc835bb2
Add Katacoda in docs 2016-09-27 21:45:29 +02:00
Emile Vauge
364958cbaf
Move jobs backoff back into traefik 
https://github.com/cenk/backoff/pull/27#issuecomment-245842725
 2016-09-27 21:45:29 +02:00
Emile Vauge
1b6af2045e
Clean web authentication 2016-09-27 21:45:29 +02:00
Emile Vauge
be09ff8e43 Merge pull request #602 from diegofernandes/master 
#504 Initial support for Docker 1.12 Swarm Mode
 2016-09-27 21:45:07 +02:00
Diego Osse Fernandes
99c8bffcbf Initial support for Docker 1.12 Swarm Mode 2016-09-27 14:21:38 -03:00
Emile Vauge
03d16d12d5 Merge pull request #697 from tuier/remove_unused_endpoint_marathon 
Remove unused endpoint when using constraints with Marathon provider
 2016-09-27 15:18:48 +02:00
tuier
1624c51cb5 remove unused endpoint when using constraints in marathon 2016-09-23 22:05:11 +01:00
Vincent Demeester
83aabefcc5 Merge pull request #696 from solidnerd/patch-1 
Replace imagelayers.io with microbadger
 2016-09-23 14:01:48 +02:00
Niclas Mietz
dfece708e1 Replace imagelayers.io with microbadger 
This replace the badge of imagelayers.io with a badge microbadger.com because imagelayers.io doesn't work anymore through the registry v2 specification and docker hub supports only the v2 spec.
 2016-09-23 13:03:44 +02:00
Emile Vauge
5d0f82ffbd Merge pull request #686 from tuier/marathon_constraints 
feat(constraints): Supports constraints for Marathon provider
 2016-09-23 09:58:17 +02:00
tuier
361dc94002 fmt 2016-09-21 17:27:48 +02:00
tuier
cc0fdf15ef test for task and application constraint 2016-09-21 17:27:47 +02:00
tuier
928675a847 feat(constraints): Support constraint for Marathon provider 2016-09-21 17:27:47 +02:00
Emile Vauge
12c1131b0c Merge pull request #689 from containous/carry-pr-439 
Carry pr 439
 2016-09-21 15:51:43 +02:00
Emile Vauge
bb1dde0469
Fix kv 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-21 14:33:45 +02:00
Samuel BERTHE
ced69b8397
refacto(constraint-kv): Move constraint checking out of template 2016-09-21 14:33:45 +02:00
Samuel BERTHE
013808956c
feat(constraints): Supports kv stores backends 2016-09-21 14:33:45 +02:00
Emile Vauge
009057cb87 Merge pull request #688 from ydubreuil/fix-clean-url 
Disable gorilla/mux URL cleaning to prevent sending redirect
 2016-09-20 21:14:39 +02:00
Yoann Dubreuil
82cb21fca3 Disable gorilla/mux URL cleaning to prevent sending redirect 
This fixes #167 and #651. By default, gorilla/mux cleans URL paths
such that adjacent slashes are collapsed into one single slash. This
behavior is pretty common in application stacks and it is fine, but
for Traefik, this can lead to incorrect URL paths forwarded to backend
servers.

See https://github.com/gorilla/mux/issues/94 for background.
 2016-09-20 20:31:11 +02:00
Vincent Demeester
7e8937a332 Merge pull request #685 from dtomcej/update-docs 
Update docs to improve contribution setup
 2016-09-20 18:04:56 +02:00
dtomcej
e5dcfa0a2e Update docs for current install 
silly spelling mistake

Document accepted values for logLevel.

Add possibility to use BindPort IPAddress 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Update marathon

Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-20 09:13:52 -06:00
Emile Vauge
f4520a011a Merge pull request #648 from containous/update-marathon 
Update marathon
 2016-09-20 16:57:44 +02:00
Emile Vauge
98dd6ca460
Update marathon 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-20 16:01:45 +02:00
Emile Vauge
c3d9312240 Merge pull request #657 from vdemeester/use-port-ip-address 
Add possibility to use BindPort IPAddress 👼
 2016-09-20 15:20:48 +02:00
Vincent Demeester
5ea761e19f
Add possibility to use BindPort IPAddress 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-09-20 14:52:35 +02:00
Vincent Demeester
46a7860427 Merge pull request #676 from InQuicker/docs-log-levels 
Document accepted values for logLevel.
 2016-09-20 09:45:20 +02:00
Jimmy Cuadra
af9b63eaed Document accepted values for logLevel. 2016-09-19 16:07:53 -07:00
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