From 8c5514612f4509403715b10712c68f961b13285f Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Thu, 7 Sep 2017 03:02:03 -0700 Subject: [PATCH] Fix whitespaces --- .github/ISSUE_TEMPLATE.md | 2 +- CONTRIBUTING.md | 10 +- MAINTAINER.md | 2 +- README.md | 6 +- contrib/scripts/dumpcerts.sh | 16 ++-- docs/basics.md | 6 +- docs/benchmarks.md | 4 +- docs/configuration/backends/boltdb.md | 2 +- docs/configuration/backends/consul.md | 2 +- docs/configuration/backends/docker.md | 2 +- docs/configuration/backends/dynamodb.md | 2 +- docs/configuration/backends/file.md | 2 +- docs/configuration/backends/rancher.md | 2 +- docs/configuration/backends/web.md | 2 +- docs/configuration/backends/zookeeper.md | 2 +- docs/configuration/commons.md | 28 +++--- docs/index.md | 2 +- docs/user-guide/cluster.md | 2 +- docs/user-guide/kv-config.md | 2 +- docs/user-guide/swarm-mode.md | 10 +- examples/compose-marathon.yml | 2 +- examples/k8s.namespace.yaml | 2 +- examples/whoami-group.json | 2 +- integration/fixtures/access_log_config.toml | 92 +++++++++---------- integration/fixtures/acme/README.md | 2 +- integration/fixtures/consul/simple.toml | 4 +- integration/fixtures/docker/simple.toml | 2 +- integration/fixtures/https/rootcas/https.toml | 2 +- .../https/rootcas/https_with_file.toml | 2 +- integration/fixtures/https/rootcas/local.crt | 2 +- integration/fixtures/simple_default.toml | 2 +- integration/resources/compose/consul.yml | 12 +-- integration/resources/compose/consul_tls.yml | 4 +- integration/resources/compose/etcd.yml | 10 +- integration/resources/tls/consul_config.json | 2 +- webui/src/app/traefik.scss | 4 +- 36 files changed, 126 insertions(+), 126 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 9bf7b6189..782643358 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -23,7 +23,7 @@ If you intend to ask a support question: DO NOT FILE AN ISSUE. HOW TO WRITE A GOOD ISSUE? - Respect the issue template as more as possible. -- If it's possible use the command `traefik bug`. See https://www.youtube.com/watch?v=Lyz62L8m93I. +- If it's possible use the command `traefik bug`. See https://www.youtube.com/watch?v=Lyz62L8m93I. - The title must be short and descriptive. - Explain the conditions which led you to write this issue: the context. - The context should lead to something, an idea or a problem that you’re facing. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 916c81b16..62834fe9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ GOHOSTOS="linux" GOOS="linux" GOPATH="/home//go" GORACE="" -## more go env's will be listed +## more go env's will be listed ``` ##### Build Træfik @@ -63,7 +63,7 @@ Once your environment is set up and the Træfik repository cloned you can build cd ~/go/src/github.com/containous/traefik # Get go-bindata. Please note, the ellipses are required -go get github.com/jteeuwen/go-bindata/... +go get github.com/jteeuwen/go-bindata/... # Start build go generate @@ -73,7 +73,7 @@ go build ./cmd/traefik # run other commands like tests ``` -You will find the Træfik executable in the `~/go/src/github.com/containous/traefik` folder as `traefik`. +You will find the Træfik executable in the `~/go/src/github.com/containous/traefik` folder as `traefik`. ### Setting up `glide` and `glide-vc` for dependency management @@ -180,7 +180,7 @@ INFO - Cleaning site directory Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting bugs and feature requests. For end-user related support questions, refer to one of the following: -- the Traefik community Slack channel: [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com) +- the Traefik community Slack channel: [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com) - [Stack Overflow](https://stackoverflow.com/questions/tagged/traefik) (using the `traefik` tag) ### Title @@ -190,7 +190,7 @@ The title must be short and descriptive. (~60 characters) ### Description - Respect the issue template as much as possible. [template](.github/ISSUE_TEMPLATE.md) -- If it's possible use the command `traefik bug`. See https://www.youtube.com/watch?v=Lyz62L8m93I. +- If it's possible use the command `traefik bug`. See https://www.youtube.com/watch?v=Lyz62L8m93I. - Explain the conditions which led you to write this issue: the context. - The context should lead to something, an idea or a problem that you’re facing. - Remain clear and concise. diff --git a/MAINTAINER.md b/MAINTAINER.md index 8e001551c..3009f42ee 100644 --- a/MAINTAINER.md +++ b/MAINTAINER.md @@ -37,7 +37,7 @@ If you want to preserve commits you must add `bot/merge-method-rebase` before `s The status `status/4-merge-in-progress` is only for the bot. -If the bot is not able to perform the merge, the label `bot/need-human-merge` is added. +If the bot is not able to perform the merge, the label `bot/need-human-merge` is added. In this case you must solve conflicts/CI/... and after you only need to remove `bot/need-human-merge`. diff --git a/README.md b/README.md index f2a9d6857..2bfae92db 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Run it and forget it! You can have a quick look at Træfik in this [Katacoda tutorial](https://www.katacoda.com/courses/traefik/deploy-load-balancer) that shows how to load balance requests between multiple Docker containers. If you are looking for a more comprehensive and real use-case example, you can also check [Play-With-Docker](http://training.play-with-docker.com/traefik-load-balancing/) to see how to load balance between multiple nodes. Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at [GopherCon 2017](https://gophercon.com/). -You will learn Træfik basics in less than 10 minutes. +You will learn Træfik basics in less than 10 minutes. [![Traefik GopherCon 2017](https://img.youtube.com/vi/RgudiksfL-k/0.jpg)](https://www.youtube.com/watch?v=RgudiksfL-k) @@ -134,13 +134,13 @@ git clone https://github.com/containous/traefik ## Documentation You can find the complete documentation at [https://docs.traefik.io](https://docs.traefik.io). -A collection of contributions around Træfik can be found at [https://awesome.traefik.io](https://awesome.traefik.io). +A collection of contributions around Træfik can be found at [https://awesome.traefik.io](https://awesome.traefik.io). ## Support To get basic support, you can: -- join the Træfik community Slack channel: [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com) +- join the Træfik community Slack channel: [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com) - use [Stack Overflow](https://stackoverflow.com/questions/tagged/traefik) (using the `traefik` tag) If you prefer commercial support, please contact [containo.us](https://containo.us) by mail: . diff --git a/contrib/scripts/dumpcerts.sh b/contrib/scripts/dumpcerts.sh index 327943727..51af73c2c 100755 --- a/contrib/scripts/dumpcerts.sh +++ b/contrib/scripts/dumpcerts.sh @@ -6,22 +6,22 @@ # # Usage - dumpcerts.sh /etc/traefik/acme.json /etc/ssl/ # -# Dependencies - +# Dependencies - # util-linux # openssl # jq # The MIT License (MIT) -# +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -78,7 +78,7 @@ We need to read this file to explode the JSON bundle... exiting. ${USAGE}" >&2 exit 2 -fi +fi if [ ! -d "${certdir}" ]; then @@ -88,7 +88,7 @@ We need a directory in which to explode the JSON bundle... exiting. ${USAGE}" >&2 exit 4 -fi +fi jq=$(command -v jq) || exit_jq @@ -126,7 +126,7 @@ trap 'umask ${oldumask}' EXIT # # openssl: # echo -e "-----BEGIN RSA PRIVATE KEY-----\n${priv}\n-----END RSA PRIVATE KEY-----" \ -# | openssl rsa -inform pem -out "${pdir}/letsencrypt.key" +# | openssl rsa -inform pem -out "${pdir}/letsencrypt.key" # # and sed: # echo "-----BEGIN RSA PRIVATE KEY-----" > "${pdir}/letsencrypt.key" @@ -142,7 +142,7 @@ echo -e "-----BEGIN RSA PRIVATE KEY-----\n${priv}\n-----END RSA PRIVATE KEY----- # Process the certificates for each of the domains in acme.json for domain in $(jq -r '.DomainsCertificate.Certs[].Certificate.Domain' acme.json); do - # Traefik stores a cert bundle for each domain. Within this cert + # Traefik stores a cert bundle for each domain. Within this cert # bundle there is both proper the certificate and the Let's Encrypt CA echo "Extracting cert bundle for ${domain}" cert=$(jq -e -r --arg domain "$domain" '.DomainsCertificate.Certs[].Certificate | diff --git a/docs/basics.md b/docs/basics.md index 39a623575..67da3acbf 100644 --- a/docs/basics.md +++ b/docs/basics.md @@ -355,7 +355,7 @@ requests periodically carried out by Traefik. The check is defined by a path appended to the backend URL and an interval (given in a format understood by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration)) specifying how often the health check should be executed (the default being 30 seconds). Each backend must respond to the health check within 5 seconds. -By default, the port of the backend server is used, however, this may be overridden. +By default, the port of the backend server is used, however, this may be overridden. A recovering backend returning 200 OK responses again is being returned to the LB rotation pool. @@ -500,9 +500,9 @@ Usage: traefik [command] [--flag=flag_argument] ``` -List of Træfik available commands with description :                                                              +List of Træfik available commands with description : -- `version` : Print version  +- `version` : Print version - `storeconfig` : Store the static traefik configuration into a Key-value stores. Please refer to the [Store Træfik configuration](/user-guide/kv-config/#store-trfk-configuration) section to get documentation on it. - `bug`: The easiest way to submit a pre-filled issue. - `healthcheck`: Calls traefik `/ping` to check health. diff --git a/docs/benchmarks.md b/docs/benchmarks.md index a3e13ec3e..d320015c6 100644 --- a/docs/benchmarks.md +++ b/docs/benchmarks.md @@ -65,8 +65,8 @@ http { keepalive_requests 10000; types_hash_max_size 2048; - open_file_cache max=200000 inactive=300s; - open_file_cache_valid 300s; + open_file_cache max=200000 inactive=300s; + open_file_cache_valid 300s; open_file_cache_min_uses 2; open_file_cache_errors on; diff --git a/docs/configuration/backends/boltdb.md b/docs/configuration/backends/boltdb.md index ce44ea67e..e9e64d799 100644 --- a/docs/configuration/backends/boltdb.md +++ b/docs/configuration/backends/boltdb.md @@ -33,4 +33,4 @@ prefix = "/traefik" # Optional # filename = "boltdb.tmpl" -``` \ No newline at end of file +``` diff --git a/docs/configuration/backends/consul.md b/docs/configuration/backends/consul.md index c92fd59e4..734f83dc0 100644 --- a/docs/configuration/backends/consul.md +++ b/docs/configuration/backends/consul.md @@ -113,4 +113,4 @@ Additional settings can be defined using Consul Catalog tags: | `traefik.frontend.rule=Host:test.traefik.io` | Override the default frontend rule (Default: `Host:{{.ServiceName}}.{{.Domain}}`). | | `traefik.frontend.passHostHeader=true` | Forward client `Host` header to the backend. | | `traefik.frontend.priority=10` | Override default frontend priority | -| `traefik.frontend.entryPoints=http,https` | Assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. | \ No newline at end of file +| `traefik.frontend.entryPoints=http,https` | Assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. | diff --git a/docs/configuration/backends/docker.md b/docs/configuration/backends/docker.md index 98ebd9164..12de434a2 100644 --- a/docs/configuration/backends/docker.md +++ b/docs/configuration/backends/docker.md @@ -168,4 +168,4 @@ exposedbydefault = false !!! warning when running inside a container, Træfik will need network access through: - `docker network connect ` \ No newline at end of file + `docker network connect ` diff --git a/docs/configuration/backends/dynamodb.md b/docs/configuration/backends/dynamodb.md index 44885dd1e..da4eb62e2 100644 --- a/docs/configuration/backends/dynamodb.md +++ b/docs/configuration/backends/dynamodb.md @@ -53,7 +53,7 @@ SecretAccessKey = "123" Endpoint = "http://localhost:8080" ``` -Items in the `dynamodb` table must have three attributes: +Items in the `dynamodb` table must have three attributes: - `id` (string): The id is the primary key. - `name`(string): The name is used as the name of the frontend or backend. diff --git a/docs/configuration/backends/file.md b/docs/configuration/backends/file.md index b6ddcbdf4..08347757d 100644 --- a/docs/configuration/backends/file.md +++ b/docs/configuration/backends/file.md @@ -148,7 +148,7 @@ filename = "rules.toml" ## Multiple .toml Files You could have multiple `.toml` files in a directory: - + ```toml [file] directory = "/path/to/config/" diff --git a/docs/configuration/backends/rancher.md b/docs/configuration/backends/rancher.md index f462d548c..784bc51a2 100644 --- a/docs/configuration/backends/rancher.md +++ b/docs/configuration/backends/rancher.md @@ -101,7 +101,7 @@ secretKey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" !!! note If Traefik needs access to the Rancher API, you need to set the `endpoint`, `accesskey` and `secretkey` parameters. - + To enable traefik to fetch information about the Environment it's deployed in only, you need to create an `Environment API Key`. This can be found within the API Key advanced options. diff --git a/docs/configuration/backends/web.md b/docs/configuration/backends/web.md index 0989deb7a..b435294b8 100644 --- a/docs/configuration/backends/web.md +++ b/docs/configuration/backends/web.md @@ -86,7 +86,7 @@ You can enable Traefik to export internal metrics to different monitoring system - DataDog ```toml -# DataDog metrics exporter type +# DataDog metrics exporter type [web.metrics.datadog] Address = "localhost:8125" Pushinterval = "10s" diff --git a/docs/configuration/backends/zookeeper.md b/docs/configuration/backends/zookeeper.md index c35e3e37e..4d834497d 100644 --- a/docs/configuration/backends/zookeeper.md +++ b/docs/configuration/backends/zookeeper.md @@ -35,4 +35,4 @@ prefix = "traefik" # filename = "zookeeper.tmpl" ``` -Please refer to the [Key Value storage structure](/user-guide/kv-config/#key-value-storage-structure) section to get documentation on traefik KV structure. \ No newline at end of file +Please refer to the [Key Value storage structure](/user-guide/kv-config/#key-value-storage-structure) section to get documentation on traefik KV structure. diff --git a/docs/configuration/commons.md b/docs/configuration/commons.md index 900ee6a1e..af3fa76be 100644 --- a/docs/configuration/commons.md +++ b/docs/configuration/commons.md @@ -154,7 +154,7 @@ logLevel = "ERROR" ### Access Logs -Access logs are written when `[accessLog]` is defined. +Access logs are written when `[accessLog]` is defined. By default it will write to stdout and produce logs in the textual Common Log Format (CLF), extended with additional fields. To enable access logs using the default settings just add the `[accessLog]` entry. @@ -197,7 +197,7 @@ This allows the logs to be rotated and processed by an external program, such as Custom error pages can be returned, in lieu of the default, according to frontend-configured ranges of HTTP Status codes. In the example below, if a 503 status is returned from the frontend "website", the custom error page at http://2.3.4.5/503.html is returned with the actual status code set in the HTTP header. -Note, the `503.html` page itself is not hosted on traefik, but some other infrastructure. +Note, the `503.html` page itself is not hosted on traefik, but some other infrastructure. ```toml [frontends] @@ -275,13 +275,13 @@ The configured status code ranges are inclusive; that is, in the above example, # If zero, no timeout exists. # Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw # values (digits). If no units are provided, the value is parsed assuming seconds. -# +# # Optional # Default: "0s" -# +# # readTimeout = "5s" -# writeTimeout is the maximum duration before timing out writes of the response. It covers the time from the end of +# writeTimeout is the maximum duration before timing out writes of the response. It covers the time from the end of # the request header read to the end of the response write. # If zero, no timeout exists. # Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw @@ -289,7 +289,7 @@ The configured status code ranges are inclusive; that is, in the above example, # # Optional # Default: "0s" -# +# # writeTimeout = "5s" # idleTimeout is the maximum duration an idle (keep-alive) connection will remain idle before closing itself. @@ -310,30 +310,30 @@ The configured status code ranges are inclusive; that is, in the above example, ```toml [forwardingTimeouts] -# dialTimeout is the amount of time to wait until a connection to a backend server can be established. +# dialTimeout is the amount of time to wait until a connection to a backend server can be established. # If zero, no timeout exists. # Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw # values (digits). If no units are provided, the value is parsed assuming seconds. -# +# # Optional # Default: "30s" -# +# # dialTimeout = "30s" -# responseHeaderTimeout is the amount of time to wait for a server's response headers after fully writing the request (including its body, if any). +# responseHeaderTimeout is the amount of time to wait for a server's response headers after fully writing the request (including its body, if any). # If zero, no timeout exists. # Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw # values (digits). If no units are provided, the value is parsed assuming seconds. # # Optional # Default: "0s" -# +# # responseHeaderTimeout = "0s" ``` ### Idle Timeout (deprecated) -Use [respondingTimeouts](/configuration/commons/#responding-timeouts) instead of `IdleTimeout`. +Use [respondingTimeouts](/configuration/commons/#responding-timeouts) instead of `IdleTimeout`. In the case both settings are configured, the deprecated option will be overwritten. `IdleTimeout` is the maximum amount of time an idle (keep-alive) connection will remain idle before closing itself. @@ -344,7 +344,7 @@ If no units are provided, the value is parsed assuming seconds. ```toml # IdleTimeout -# +# # DEPRECATED - see [respondingTimeouts] section. # # Optional @@ -388,7 +388,7 @@ filename = "my_custom_config_template.tpml" The template files can be written using functions provided by: -- [go template](https://golang.org/pkg/text/template/) +- [go template](https://golang.org/pkg/text/template/) - [sprig library](https://masterminds.github.io/sprig/) Example: diff --git a/docs/index.md b/docs/index.md index e91c27659..0be52991c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -71,7 +71,7 @@ Run it and forget it! You can have a quick look at Træfik in this [Katacoda tutorial](https://www.katacoda.com/courses/traefik/deploy-load-balancer) that shows how to load balance requests between multiple Docker containers. Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at [GopherCon 2017](https://gophercon.com). -You will learn Træfik basics in less than 10 minutes. +You will learn Træfik basics in less than 10 minutes. [![Traefik GopherCon 2017](https://img.youtube.com/vi/RgudiksfL-k/0.jpg)](https://www.youtube.com/watch?v=RgudiksfL-k) diff --git a/docs/user-guide/cluster.md b/docs/user-guide/cluster.md index c512c4f35..cf06a9702 100644 --- a/docs/user-guide/cluster.md +++ b/docs/user-guide/cluster.md @@ -18,4 +18,4 @@ Once your Træfik configuration is uploaded on your KV store, you can start each A Træfik cluster is based on a manager/worker model. When starting, Træfik will elect a manager. If this instance fails, another manager will be automatically elected. - + diff --git a/docs/user-guide/kv-config.md b/docs/user-guide/kv-config.md index de18cd925..012f757d1 100644 --- a/docs/user-guide/kv-config.md +++ b/docs/user-guide/kv-config.md @@ -36,7 +36,7 @@ consul: - "8301" - "8301/udp" - "8302" - - "8302/udp" + - "8302/udp" whoami1: image: emilevauge/whoami diff --git a/docs/user-guide/swarm-mode.md b/docs/user-guide/swarm-mode.md index ea77b1a03..55cf754e3 100644 --- a/docs/user-guide/swarm-mode.md +++ b/docs/user-guide/swarm-mode.md @@ -303,11 +303,11 @@ Wait, I thought we added the sticky flag to `whoami1`? Traefik relies on a cook First you need to add `whoami1.traefik` to your hosts file: ```shell -if [ -n "$(grep whoami1.traefik /etc/hosts)" ]; -then - echo "whoami1.traefik already exists (make sure the ip is current)"; -else - sudo -- sh -c -e "echo '$(docker-machine ip manager)\twhoami1.traefik' >> /etc/hosts"; +if [ -n "$(grep whoami1.traefik /etc/hosts)" ]; +then + echo "whoami1.traefik already exists (make sure the ip is current)"; +else + sudo -- sh -c -e "echo '$(docker-machine ip manager)\twhoami1.traefik' >> /etc/hosts"; fi ``` diff --git a/examples/compose-marathon.yml b/examples/compose-marathon.yml index 8c30b1033..7b3a1bc1f 100644 --- a/examples/compose-marathon.yml +++ b/examples/compose-marathon.yml @@ -56,4 +56,4 @@ services: - "mesos-slave:172.17.0.1" environment: - MARATHON_ZK=zk://zookeeper:2181/marathon - - MARATHON_MASTER=zk://zookeeper:2181/mesos \ No newline at end of file + - MARATHON_MASTER=zk://zookeeper:2181/mesos diff --git a/examples/k8s.namespace.yaml b/examples/k8s.namespace.yaml index 64e53ec0d..abc1ad232 100755 --- a/examples/k8s.namespace.yaml +++ b/examples/k8s.namespace.yaml @@ -3,4 +3,4 @@ apiVersion: v1 metadata: name: kube-system labels: - name: kube-system \ No newline at end of file + name: kube-system diff --git a/examples/whoami-group.json b/examples/whoami-group.json index 9c21a8dae..ee43b62b4 100644 --- a/examples/whoami-group.json +++ b/examples/whoami-group.json @@ -37,4 +37,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/integration/fixtures/access_log_config.toml b/integration/fixtures/access_log_config.toml index 2a3e0ed08..154e58d30 100644 --- a/integration/fixtures/access_log_config.toml +++ b/integration/fixtures/access_log_config.toml @@ -1,46 +1,46 @@ -################################################################ -# Global configuration -################################################################ -traefikLogsFile = "traefik.log" -accessLogsFile = "access.log" -logLevel = "ERROR" -defaultEntryPoints = ["http"] -[entryPoints] - [entryPoints.http] - address = ":8000" - -################################################################ -# Web configuration backend -################################################################ -[web] -address = ":7888" - -################################################################ -# File configuration backend -################################################################ -[file] - -################################################################ -# rules -################################################################ - [backends] - [backends.backend1] - [backends.backend1.servers.server1] - url = "http://127.0.0.1:8081" - [backends.backend2] - [backends.backend2.LoadBalancer] - method = "drr" - [backends.backend2.servers.server1] - url = "http://127.0.0.1:8082" - [backends.backend2.servers.server2] - url = "http://127.0.0.1:8083" - [frontends] - [frontends.frontend1] - backend = "backend1" - [frontends.frontend1.routes.test_1] - rule = "Path: /test1" - [frontends.frontend2] - backend = "backend2" - passHostHeader = true - [frontends.frontend2.routes.test_2] - rule = "Path: /test2" \ No newline at end of file +################################################################ +# Global configuration +################################################################ +traefikLogsFile = "traefik.log" +accessLogsFile = "access.log" +logLevel = "ERROR" +defaultEntryPoints = ["http"] +[entryPoints] + [entryPoints.http] + address = ":8000" + +################################################################ +# Web configuration backend +################################################################ +[web] +address = ":7888" + +################################################################ +# File configuration backend +################################################################ +[file] + +################################################################ +# rules +################################################################ + [backends] + [backends.backend1] + [backends.backend1.servers.server1] + url = "http://127.0.0.1:8081" + [backends.backend2] + [backends.backend2.LoadBalancer] + method = "drr" + [backends.backend2.servers.server1] + url = "http://127.0.0.1:8082" + [backends.backend2.servers.server2] + url = "http://127.0.0.1:8083" + [frontends] + [frontends.frontend1] + backend = "backend1" + [frontends.frontend1.routes.test_1] + rule = "Path: /test1" + [frontends.frontend2] + backend = "backend2" + passHostHeader = true + [frontends.frontend2.routes.test_2] + rule = "Path: /test2" diff --git a/integration/fixtures/acme/README.md b/integration/fixtures/acme/README.md index e9eedd4c0..44878dbc0 100644 --- a/integration/fixtures/acme/README.md +++ b/integration/fixtures/acme/README.md @@ -34,4 +34,4 @@ sudo openssl genrsa -out "$SSL_DIR/wildcard.key" 2048 sudo openssl req -new -subj "$(echo -n "$SUBJ" | tr "\n" "/")" -key "$SSL_DIR/wildcard.key" -out "$SSL_DIR/wildcard.csr" -passin pass:$PASSPHRASE sudo openssl x509 -req -days 3650 -in "$SSL_DIR/wildcard.csr" -signkey "$SSL_DIR/wildcard.key" -out "$SSL_DIR/wildcard.crt" sudo rm -f "$SSL_DIR/wildcard.csr" -``` \ No newline at end of file +``` diff --git a/integration/fixtures/consul/simple.toml b/integration/fixtures/consul/simple.toml index 317edc354..e4bbb1a44 100644 --- a/integration/fixtures/consul/simple.toml +++ b/integration/fixtures/consul/simple.toml @@ -11,6 +11,6 @@ logLevel = "DEBUG" endpoint = "{{.ConsulHost}}:8500" watch = true prefix = "traefik" - + [web] - address = ":8081" \ No newline at end of file + address = ":8081" diff --git a/integration/fixtures/docker/simple.toml b/integration/fixtures/docker/simple.toml index d3c3052ab..14ec46557 100644 --- a/integration/fixtures/docker/simple.toml +++ b/integration/fixtures/docker/simple.toml @@ -12,4 +12,4 @@ logLevel = "DEBUG" endpoint = "{{.DockerHost}}" domain = "docker.localhost" -exposedbydefault = true \ No newline at end of file +exposedbydefault = true diff --git a/integration/fixtures/https/rootcas/https.toml b/integration/fixtures/https/rootcas/https.toml index 4623351cd..8466b2f57 100644 --- a/integration/fixtures/https/rootcas/https.toml +++ b/integration/fixtures/https/rootcas/https.toml @@ -38,4 +38,4 @@ fblo6RBxUQ== [frontends.frontend1] backend = "backend1" [frontends.frontend1.routes.test_1] - rule = "Path: /ping" \ No newline at end of file + rule = "Path: /ping" diff --git a/integration/fixtures/https/rootcas/https_with_file.toml b/integration/fixtures/https/rootcas/https_with_file.toml index 294ba4a75..a95571a36 100644 --- a/integration/fixtures/https/rootcas/https_with_file.toml +++ b/integration/fixtures/https/rootcas/https_with_file.toml @@ -22,4 +22,4 @@ RootCAs = [ "fixtures/https/rootcas/local.crt"] [frontends.frontend1] backend = "backend1" [frontends.frontend1.routes.test_1] - rule = "Path: /ping" \ No newline at end of file + rule = "Path: /ping" diff --git a/integration/fixtures/https/rootcas/local.crt b/integration/fixtures/https/rootcas/local.crt index 017a30876..07457e03e 100644 --- a/integration/fixtures/https/rootcas/local.crt +++ b/integration/fixtures/https/rootcas/local.crt @@ -11,4 +11,4 @@ AAAAATANBgkqhkiG9w0BAQsFAAOBgQCEcetwO59EWk7WiJsG4x8SY+UIAA+flUI9 tyC4lNhbcF2Idq9greZwbYCqTTTr2XiRNSMLCOjKyI7ukPoPjo16ocHj+P3vZGfs h1fIw3cSS2OolhloGw/XM6RWPWtPAlGykKLciQrBru5NAPvCMsb/I1DAceTiotQM fblo6RBxUQ== ------END CERTIFICATE----- \ No newline at end of file +-----END CERTIFICATE----- diff --git a/integration/fixtures/simple_default.toml b/integration/fixtures/simple_default.toml index d61410d7c..ff256c8a2 100644 --- a/integration/fixtures/simple_default.toml +++ b/integration/fixtures/simple_default.toml @@ -2,4 +2,4 @@ defaultEntryPoints = ["http"] [entryPoints] [entryPoints.http] - address = ":8000" \ No newline at end of file + address = ":8000" diff --git a/integration/resources/compose/consul.yml b/integration/resources/compose/consul.yml index 065769fbb..af10fad2e 100644 --- a/integration/resources/compose/consul.yml +++ b/integration/resources/compose/consul.yml @@ -10,16 +10,16 @@ consul: - "8301" - "8301/udp" - "8302" - - "8302/udp" - + - "8302/udp" + whoami1: image: emilevauge/whoami - + whoami2: image: emilevauge/whoami - + whoami3: image: emilevauge/whoami - + whoami4: - image: emilevauge/whoami \ No newline at end of file + image: emilevauge/whoami diff --git a/integration/resources/compose/consul_tls.yml b/integration/resources/compose/consul_tls.yml index 41a666799..3cd3f31c8 100644 --- a/integration/resources/compose/consul_tls.yml +++ b/integration/resources/compose/consul_tls.yml @@ -9,6 +9,6 @@ consul: - "8301" - "8301/udp" - "8302" - - "8302/udp" + - "8302/udp" volumes: - - ../tls:/configs \ No newline at end of file + - ../tls:/configs diff --git a/integration/resources/compose/etcd.yml b/integration/resources/compose/etcd.yml index 4023b18bc..0452454fd 100644 --- a/integration/resources/compose/etcd.yml +++ b/integration/resources/compose/etcd.yml @@ -1,14 +1,14 @@ etcd: image: containous/docker-etcd - + whoami1: image: emilevauge/whoami - + whoami2: image: emilevauge/whoami - + whoami3: image: emilevauge/whoami - + whoami4: - image: emilevauge/whoami \ No newline at end of file + image: emilevauge/whoami diff --git a/integration/resources/tls/consul_config.json b/integration/resources/tls/consul_config.json index 005d381a7..bd3aa403e 100644 --- a/integration/resources/tls/consul_config.json +++ b/integration/resources/tls/consul_config.json @@ -6,4 +6,4 @@ "cert_file": "/configs/consul.cert", "key_file": "/configs/consul.key", "verify_outgoing": true -} \ No newline at end of file +} diff --git a/webui/src/app/traefik.scss b/webui/src/app/traefik.scss index 9aa01ff24..08b3e5729 100644 --- a/webui/src/app/traefik.scss +++ b/webui/src/app/traefik.scss @@ -26,9 +26,9 @@ } table { - table-layout: fixed; + table-layout: fixed; } td, th { word-wrap: break-word; -} \ No newline at end of file +}