Commit graph

3183 commits

Author SHA1 Message Date
Vincent Demeester
89e297db02 Merge pull request #28 from EmileVauge/benchmarks
Added benchmarks https://github.com/EmileVauge/traefik/issues/22
2015-09-28 07:23:42 +01:00
emile
db4f3f64fa Added benchmarks https://github.com/EmileVauge/traefik/issues/22 2015-09-26 15:10:14 +02:00
Vincent Demeester
bbfd6c7257 Merge pull request #23 from EmileVauge/certificates-docker-image
Corrects #21 — add certificates to docker image
2015-09-26 11:33:17 +02:00
emile
9edd4874ac refactoring server 2015-09-25 22:02:55 +02:00
emile
71bb22fd0a Corrects https://github.com/EmileVauge/traefik/issues/21 2015-09-25 17:46:52 +02:00
Emile Vauge
ce1d14d779 Merge pull request #18 from thorhs/marathon_get_prefixes
Add getPrefixes to get string array of PathPrefixes
2015-09-24 22:30:14 +02:00
emile
bb12e1c48c URL case corrections 2015-09-24 22:17:40 +02:00
emile
21b876f3d4 Merge branch 'vdemeester-typos-and-imports' 2015-09-24 20:17:42 +02:00
emile
c89f171b54 Merge branch 'typos-and-imports' of https://github.com/vdemeester/traefik into vdemeester-typos-and-imports 2015-09-24 20:17:27 +02:00
Vincent Demeester
c038dfbd54 Fix some typos, fmt and imports :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-24 17:16:13 +02:00
emile
8509016ead Merge branch 'vdemeester-validate-govet' 2015-09-24 16:09:49 +02:00
emile
396a8f9360 Merge branch 'validate-govet' of https://github.com/vdemeester/traefik into vdemeester-validate-govet 2015-09-24 16:09:39 +02:00
Vincent Demeester
cae02b02ac Merge pull request #16 from EmileVauge/logrus-backend
Logrus logging backend
2015-09-24 15:47:44 +02:00
emile
f5ddbcbcde Logrus logging backend https://github.com/EmileVauge/traefik/issues/15 2015-09-24 14:53:51 +02:00
emile
35a1454082 Exit on permission denied 2015-09-24 13:08:59 +02:00
emile
cffa74f9cf Exit on permission denied 2015-09-24 13:05:44 +02:00
emile
81af7ab264 Exit on permission denied 2015-09-24 11:41:41 +02:00
emile
f37349fff7 Documentation corrections 2015-09-24 10:01:57 +02:00
Vincent Demeester
4f5005b6bd Add govet target and script
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-23 21:44:06 +02:00
Thorhallur Sverrisson
cc795b917a Removing debug Printf statements 2015-09-23 11:45:18 +00:00
Thorhallur Sverrisson
cfa232741d Adding error checks to REST calls 2015-09-23 11:45:18 +00:00
Thorhallur Sverrisson
c263560401 Documentation improvements 2015-09-23 11:45:18 +00:00
Thorhallur Sverrisson
a07e395181 Refactoring REST API to handle multiple providers.
I changed what I think is needed and I have done manual testing on this.

I tried to keep the changes to a minimun.

The changes are approx:

* HTML output now includes the provider name in parenthesis.
  * I'm not versed in bootstrap, should the output group providers in a
  * table?
* PUT is only enabled on /api/web.
* GET on /api returns a map containing all providers configuration
* GET on /api/{provider} will return the config as before on that
* provider.
2015-09-23 11:45:18 +00:00
Thorhallur Sverrisson
55a50c5ab7 Setting webConfiguration on REST PUT to /api 2015-09-23 11:25:11 +00:00
Thorhallur Sverrisson
f534d8817f Adding caching and merging of configurations
Configurations are now cached from each provider separately so that
we can merge them together when one provider has changed config.

The Web module also returns full config info through the HTML call,
but REST API is working on a separate web configuration that is
sent in just like any other.
2015-09-23 11:25:11 +00:00
emile
42a23171ae ghr bug? 2015-09-22 23:29:45 +02:00
emile
e4159564ca SSL for web backend 2015-09-22 21:00:29 +02:00
emile
7e62c7323c docs on traefik.enable 2015-09-22 16:15:09 +02:00
emile
41ada41b35 Merge branch 'gitter-badger-gitter-badge' 2015-09-22 16:08:10 +02:00
emile
a2522a5ef6 Gitter badge 2015-09-22 16:07:49 +02:00
The Gitter Badger
b78b50c7a1 Add Gitter badge 2015-09-22 13:51:46 +00:00
Thorhallur Sverrisson
bc94ace7d3 Add getPrefixes to get string array of PathPrefixes
Marathon label traefik.prefixes can be used to specify what
prefixes to use.

New example marathon-prefix.tmpl to take advantage of this new
mechanism.
2015-09-22 11:36:58 +00:00
emile
5b7abc1398 update img 2015-09-22 12:12:41 +02:00
emile
0ce482eb9c Merge https://github.com/EmileVauge/traefik/pull/4 2015-09-22 12:03:15 +02:00
emile
ccfdd1ff63 Removes Godeps/_workspace/src from git 2015-09-22 11:58:43 +02:00
emile
8825a26ae6 Merge PR https://github.com/EmileVauge/traefik/pull/3 2015-09-22 11:29:41 +02:00
emile
967e033b7e Update .gitignore 2015-09-22 10:54:54 +02:00
emile
f743cd8bff Docs corrections 2015-09-22 10:50:33 +02:00
Emile Vauge
3ae51bbb11 Delete traefik.toml 2015-09-22 10:38:40 +02:00
emile
2d956da3e1 Docs 2015-09-22 10:33:37 +02:00
emile
d8e8815ad1 Consul Backend 2015-09-21 18:05:56 +02:00
emile
32c0ffe87a Corrects log level 2015-09-21 10:50:46 +02:00
emile
4ec6b06b8b Removes windows in platforms because of https://github.com/mailgun/log/issues/10 2015-09-19 14:56:28 +02:00
emile
9efabe2a65 Circuit breaker middleware 2015-09-19 13:25:55 +02:00
emile
616c58ad4b Circuit breaker middleware 2015-09-19 13:02:59 +02:00
Emile Vauge
9d46c5017c Update circle.yml 2015-09-17 20:54:50 +02:00
emile
56b8f47a85 OxyLogger 2015-09-17 16:29:44 +02:00
emile
7b96decf17 note found handler 2015-09-16 22:41:14 +02:00
emile
2d645c83a6 api enhancements 2015-09-16 19:08:01 +02:00
emile
331a92281b Correct bad docker image name if REPO contains uppercase 2015-09-16 18:07:58 +02:00