Compare commits

...

3 Commits

Author SHA1 Message Date
a64a9fdaff Pin specific traefik version, subdomain work, tubesync attempt.
- References to .yml files
- Pin specific traefik version
- add tubesync shit.

Tubesync is not working as expected. I think I've got traefik
behaving, but the app itself is not, and I can't figure out why. Its
getting sigterms every ~4 or 5 minutes without every really getting
going.
2021-10-24 19:34:53 -05:00
534a7813ec Additional yml change. 2021-10-24 19:34:48 -05:00
ad40d77b64 Change from toml to yml. 2021-10-24 19:34:35 -05:00
4 changed files with 66 additions and 52 deletions

View File

@ -76,7 +76,7 @@
mode: 0777
with_items:
- {src: 'mediaserver-compose.yml', dest: '/home/josiah/apps/mediaserver/mediaserver-compose.yml'}
- {src: 'traefik.toml', dest: '/home/josiah/apps/traefik/traefik.toml'}
- {src: 'traefik.yml.j2', dest: '/home/josiah/apps/traefik/traefik.yml'}
- name: Ensure acme.json exists
copy:

View File

@ -2,19 +2,19 @@
version: '3.7'
services:
traefik:
image: traefik
image: traefik:2.5
networks:
- pubnet
command: --web --docker --docker.swarmmode --docker.watch --docker.domain="hatchery.home.jowj.net" --logLevel=DEBUG
command: --web --docker --docker.swarmmode --docker.watch --docker.domain="services.jowj.net" --logLevel=DEBUG /etc/traefik/
ports:
- 80:80
- 443:443
- 8080:8080
- 80:80/tcp
- 443:443/tcp
- 8080:8080/tcp
volumes:
- /home/josiah/apps/traefik/acme.json:/acme.json
- traefik_logs:/var/log/access.log
- /var/run/docker.sock:/var/run/docker.sock
- /home/josiah/apps/traefik/traefik.toml:/traefik.toml
- /home/josiah/apps/traefik/traefik.yml:/traefik.yml
deploy:
mode: global
placement:
@ -23,7 +23,9 @@ services:
environment:
DO_AUTH_TOKEN: "{{ DO_AUTH_TOKEN }}"
labels:
# dashboards
# Dashboard shit I stole from Micah:
# WARNING: A TRAILING SLASH IS MANDATORY IN THE BROWSER
# e.g. https://example.com/dashboard/, not merely /dashboard
- "traefik.enable=true"
- "traefik.http.routers.mediaserver-traefik-api.tls.certResolver=mediaserver-resolver"
- "traefik.http.routers.mediaserver-traefik-api.rule=Host(`hatchery.home.jowj.net`)&&(PathPrefix(`/api`)||PathPrefix(`/dashboard`)||PathPrefix(`/debug`))"
@ -154,7 +156,8 @@ services:
- "traefik.http.routers.mediaserver-whoami.service=mediaserver-whoami"
- "traefik.http.services.mediaserver-whoami.loadbalancer.server.port=80"
- "traefik.http.routers.mediaserver-whoami.tls.certResolver=mediaserver-resolver"
- "traefik.http.routers.mediaserver-whoami.tls=true"
- "traefik.http.routers.mediaserver-whoami.tls=true"
watchtower:
# https://hub.docker.com/r/centurylink/watchtower/
image: v2tec/watchtower:latest
@ -167,18 +170,16 @@ services:
- pubnet
labels:
- "traefik.enable=true"
- "traefik.http.routers.mediaserver-watchtower.rule=Host(`hatchery.home.jowj.net`) && PathPrefix(`/watchtower`)"
- "traefik.http.routers.mediaserver-watchtower.rule=Host(`watchtower.services.jowj.net`)"
- "traefik.http.routers.mediaserver-watchtower.service=mediaserver-watchtower"
- "traefik.http.services.mediaserver-watchtower.loadbalancer.server.port=80"
- "traefik.http.routers.mediaserver-watchtower.tls.certResolver=mediaserver-resolver"
- "traefik.http.routers.mediaserver-watchtower.tls=true"
tubesync:
image: ghcr.io/meeb/tubesync:latest
image: ghcr.io/meeb/tubesync:v0.9.1
container_name: tubesync
restart: unless-stopped
ports:
- 4848:4848
networks:
- pubnet
environment:
@ -190,11 +191,11 @@ services:
- "/home/josiah/Downloads/tubesync-downloads/:/downloads"
labels:
- "traefik.enable=true"
- "traefik.http.services.mediaserver-tubesync.loadbalancer.server.port=4848"
- "traefik.http.services.mediaserver-tubesync.loadbalancer.server.port=8080"
- "traefik.http.routers.mediaserver-tubesync.service=mediaserver-tubesync"
- "traefik.http.routers.mediaserver-tubesync.rule=Host(`hatchery.home.jowj.net`) && PathPrefix(`/tubesync`)"
- "traefik.http.routers.mediaserver-tubesync.rule=Host(`tubesync.services.jowj.net`)"
- "traefik.http.routers.mediaserver-tubesync.tls.certResolver=mediaserver-resolver"
- "traefik.http.routers.mediaserver-tubesync.tls=true"
- "traefik.http.routers.mediaserver-tubesync.tls=true"
volumes:
traefik_acme:

View File

@ -1,36 +0,0 @@
# defaultEntryPoints must be at the top
# because it should not be in any table below
defaultEntryPoints = ["http", "https"]
[log]
level = "DEBUG"
[api]
dashboard = true
[entryPoints]
[entryPoints.http]
address = ":80"
[entryPoints.https]
address = ":443"
[http.middlewares]
[http.middlewares.mediaserver-https-redir.redirectScheme]
scheme = "https"
permanent = true
[certificatesResolvers.mediaserver-resolver.acme]
storage = "/acme.json"
email = "admin@home.jowj.net"
[certificatesResolvers.mediaserver-resolver.acme.dnsChallenge]
provider = "digitalocean"
delayBeforeCheck = 0
[providers.docker]
[docker]
endpoint = "unix:///var/run/docker.sock"
domain = "hatchery.home.jowj.net"
watch = true
exposedbydefault = false

View File

@ -0,0 +1,49 @@
---
# defaultEntryPoints must be at the top
defaultEntryPoints:
- http
- https
log:
level: DEBUG
format: common
accessLog:
format: common
api:
dashboard: true
entryPoints:
http:
address: ":80"
https:
address: ":443"
http:
middlewares:
mediaserver-https-redir:
redirectScheme:
scheme: https
permanent: true
certificatesResolvers:
mediaserver-resolver:
acme:
storage: /acme.json
email: "admin@home.jowj.net"
dnsChallenge:
provider: "digitalocean"
providers:
docker: {}
docker:
endpoint: unix:///var/run/docker.sock
domain: "services.jowj.net"
watch: true
exposedbydefault: false
# smh https://github.com/traefik/traefik/issues/7360
pilot:
dashboard: false