From 0c4d60d4cd69989888d4d308dafe4b4d3b1b663f Mon Sep 17 00:00:00 2001 From: Jayden Pyles Date: Wed, 26 Jun 2024 20:14:43 -0500 Subject: [PATCH] fix: traefik --- ansible/config.yaml | 2 +- docker-compose.yml | 12 ++++++++---- traefik.toml | 20 -------------------- 3 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 traefik.toml diff --git a/ansible/config.yaml b/ansible/config.yaml index 3c43115..999b526 100644 --- a/ansible/config.yaml +++ b/ansible/config.yaml @@ -1,3 +1,3 @@ github_repo: https://github.com/jaypyles/webapp-template.git -deploy_path: /home/admin/site-test4 +deploy_path: /home/admin/site-test6 deploy_command: make pull up-prd diff --git a/docker-compose.yml b/docker-compose.yml index a7d931d..9f360cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,15 +15,19 @@ services: traefik: image: traefik:latest container_name: traefik + command: + - "--providers.docker=true" + - "--entrypoints.web.address=:80" + - "--entrypoints.websecure.address=:443" + - "--providers.file.filename=/etc/traefik/dynamic_conf.yaml" ports: - 80:80 - 443:443 volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "./traefik.toml:/etc/traefik/traefik.toml" - # - "./dynamic_conf.yaml:/etc/traefik/dynamic_conf.yaml" - # - "/etc/ssl/private/ssl-cert.key:/etc/certs/ssl-cert.key" - # - "/etc/ssl/certs/ssl-cert.pem:/etc/certs/ssl-cert.pem" + - "./dynamic_conf.yaml:/etc/traefik/dynamic_conf.yaml" + - "/etc/letsencrypt/live/domain/fullchain.pem:/etc/certs/ssl-cert.pem" + - "/etc/letsencrypt/live/domain/privkey.pem:/etc/certs/ssl-cert.key" networks: - web networks: diff --git a/traefik.toml b/traefik.toml deleted file mode 100644 index 66416b4..0000000 --- a/traefik.toml +++ /dev/null @@ -1,20 +0,0 @@ -[entryPoints] - [entryPoints.web] - address = ":80" - [entryPoints.websecure] - address = ":443" - -[providers] - [providers.docker] - -[certificatesResolvers] - [certificatesResolvers.myresolver] - [certificatesResolvers.myresolver.acme] - email = "your-email@example.com" - storage = "acme.json" - [certificatesResolvers.myresolver.acme.httpChallenge] - entryPoint = "web" - -[[tls.certificates]] - certFile = "/etc/certs/ssl-cert.pem" - keyFile = "/etc/certs/ssl-cert.key"