From 4a05a5b1f24b9334315ca6acfd287e88a84b3990 Mon Sep 17 00:00:00 2001 From: Ali Shanaakh Date: Tue, 11 Sep 2018 00:48:18 +0300 Subject: [PATCH] Fix broken traefik proxy (fixes #176) --- .gitignore | 1 + Makefile | 5 ++++- config/traefik.toml | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..36c4e928 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +config/acme.json diff --git a/Makefile b/Makefile index 9c653248..221a6cb1 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,10 @@ dependencies: $(COMPOSE) up -d vault db phpmyadmin redis rabbitmq mailcatcher ranger coinhub $(COMPOSE) run --rm vault secrets enable totp || true -prepare: dependencies daemons cryptonodes +proxy: + @touch config/acme.json && chmod 0600 config/acme.json + +prepare: proxy dependencies daemons cryptonodes setup-apps: build $(COMPOSE) run --rm peatio bash -c "./bin/link_config && bundle exec rake db:create db:migrate db:seed" diff --git a/config/traefik.toml b/config/traefik.toml index e5dbe054..a099b44b 100644 --- a/config/traefik.toml +++ b/config/traefik.toml @@ -1,6 +1,8 @@ logLevel = "INFO" defaultEntryPoints = ["https","http"] +[api] + [entryPoints] [entryPoints.http] address = ":80" @@ -12,7 +14,7 @@ defaultEntryPoints = ["https","http"] [docker] endpoint = "unix:///var/run/docker.sock" -domain = "wb.local" +domain = "local" watch = true exposedbydefault = false @@ -21,5 +23,7 @@ email = "support@heliostech.fr" storage = "acme.json" entryPoint = "https" OnHostRule = true +usebindportip = true + [acme.httpChallenge] entryPoint = "http"