diff --git a/Generated/.gitignore b/Generated/.gitignore index 5c11526..d3ac46f 100644 --- a/Generated/.gitignore +++ b/Generated/.gitignore @@ -1,2 +1,3 @@ *.yml -*.tmpl \ No newline at end of file +*.tmpl +*.toml \ No newline at end of file diff --git a/Production/traefilk.toml b/Production/traefilk.toml new file mode 100644 index 0000000..25f823a --- /dev/null +++ b/Production/traefilk.toml @@ -0,0 +1,35 @@ +defaultEntryPoints = ["https","http"] + +logLevel="ERROR" + +[entryPoints] + useXForwardedFor = true + [entryPoints.http] + address = ":80" + [entryPoints.http.redirect] + entryPoint = "https" + [entryPoints.https] + address = ":443" + [entryPoints.https.tls] + +[retry] + +[docker] +endpoint = "unix:///var/run/docker.sock" +watch = true +exposedByDefault = false + +[acme] +storage = "acme.json" +entryPoint = "https" +onHostRule = true +[acme.httpChallenge] +entryPoint = "http" + +[traefikLog] + filePath = "/traefik_logs/traefik.log" + format = "json" + +[accessLog] + filePath = "/traefik_logs/access.log" + format = "json" \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 840d9a4..2eb4277 100755 --- a/build.ps1 +++ b/build.ps1 @@ -21,3 +21,7 @@ docker run -v "$(Get-Location)\Generated:/app/Generated" ` If ($BTCPAYGEN_REVERSEPROXY -eq "nginx") { Copy-Item ".\Production\nginx.tmpl" -Destination ".\Generated" } + +If ($BTCPAYGEN_REVERSEPROXY -eq "traefik") { + Copy-Item ".\Production\traefik.toml" -Destination ".\Generated" +} diff --git a/build.sh b/build.sh index 62b1a65..bc66030 100755 --- a/build.sh +++ b/build.sh @@ -22,3 +22,11 @@ docker run -v "$(pwd)/Generated:/app/Generated" \ if [ "$BTCPAYGEN_REVERSEPROXY" == "nginx" ]; then cp Production/nginx.tmpl Generated/nginx.tmpl fi + +if [ "$BTCPAYGEN_REVERSEPROXY" == "traefik" ]; then + cp Production/traefik.toml Generated/traefik.toml +fi + + + + diff --git a/docker-compose-generator/docker-fragments/traefik-labels.yml b/docker-compose-generator/docker-fragments/traefik-labels.yml index e98062e..e361858 100644 --- a/docker-compose-generator/docker-fragments/traefik-labels.yml +++ b/docker-compose-generator/docker-fragments/traefik-labels.yml @@ -8,3 +8,5 @@ services: - "traefik.enable=true" - "traefik.frontend.rule=Host:${BTCPAY_HOST}" - "traefik.port.rule=49392" + - "traefik.acme.domains=${BTCPAY_HOST},www.${BTCPAY_HOST}" + - "traefik.acme.email=${LETSENCRYPT_EMAIL}" diff --git a/docker-compose-generator/docker-fragments/traefik.yml b/docker-compose-generator/docker-fragments/traefik.yml index a470f24..f1fd316 100644 --- a/docker-compose-generator/docker-fragments/traefik.yml +++ b/docker-compose-generator/docker-fragments/traefik.yml @@ -9,11 +9,12 @@ services: - "80:80" - "443:443" volumes: - - "/var/run/docker.sock:/var/run/docker.sock" - - "./traefik.toml:/traefik.toml" - - "./acme.json:/acme.json" - - "./servers.toml:/servers.toml" - - "./traefik_logs:/traefik_logs" + - "/var/run/docker.sock:/var/run/docker.sock" + - "./traefik.toml:/traefik.toml" + - "./acme.json:/acme.json" + - "./servers.toml:/servers.toml" + - "./traefik_logs:/traefik_logs" + links: - btcpayserver