diff --git a/examples/traefik/docker-compose-traefik.yml b/examples/traefik/docker-compose-traefik.yml index 3b24f4e3..00a94c96 100644 --- a/examples/traefik/docker-compose-traefik.yml +++ b/examples/traefik/docker-compose-traefik.yml @@ -25,7 +25,7 @@ services: # # - # Service › TVApp2 › Traefik Labels + # Service › TVApp2 # # tvapp2: @@ -55,7 +55,7 @@ services: - traefik.enable=true # # - # Scope > http + # Routers › Web Interface › http # # - traefik.http.routers.tvapp2-http.rule=Host(`tvapp2.localhost`) || Host(`tvapp2.domain.lan`) || Host(`www.tvapp2.domain.lan`) || Host(`${SERVICE_IP}`) @@ -65,7 +65,7 @@ services: - traefik.http.routers.tvapp2-http.middlewares=https-redirect@file # # - # Scope > https + # Routers › Web Interface › https # # remove the authentik@file line if you do not wish to use Authentik or middleware # - traefik.http.routers.tvapp2-https.middlewares=authentik@file @@ -82,8 +82,26 @@ services: - traefik.http.routers.tvapp2-https.middlewares=authentik@file # # - # Load Balancer + # Routers › HDHomeRun # # - - traefik.http.services.tvapp2.loadbalancer.server.port=http - - traefik.http.services.tvapp2.loadbalancer.server.scheme=4124 + - traefik.http.routers.hdhr-https.rule=Host(`hdhr.domain.lan`) + - traefik.http.routers.hdhr-https.service=hdhr + - traefik.http.routers.hdhr-https.entrypoints=https + - traefik.http.routers.hdhr-https.priority=1 + - traefik.http.routers.hdhr-https.tls=true + - traefik.http.routers.hdhr-https.tls.certresolver=cloudflare + + # # + # Services › Main Web Interface + # # + + - traefik.http.services.tvapp2.loadbalancer.server.port=4124 + - traefik.http.services.tvapp2.loadbalancer.server.scheme=http + + # # + # Services › HDHomeRun Server (optional) + # # + + - traefik.http.services.hdhr.loadbalancer.server.port=6077 + - traefik.http.services.hdhr.loadbalancer.server.scheme=http diff --git a/examples/traefik/dynamic.yml b/examples/traefik/dynamic.yml index 2c4f939c..783830ff 100644 --- a/examples/traefik/dynamic.yml +++ b/examples/traefik/dynamic.yml @@ -295,24 +295,24 @@ http: - "*.domain.lan" # # - # @container TVApp2 - # @desc utomatic M3U playlist and XML guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. + # @container TVApp2 › Main + # @desc automatic M3U playlist and XML guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @url https://github.com/TheBinaryNinja/tvapp2 # - # remove / comment out the authentik line if you do not plan to use authentik: - # - authentik@file + # remove / comment out the authentik line if you do not plan to use authentik: + # - authentik@file # # - tvapp2-http: - service: "tvapp2" + tvapp2-server-http: + service: "tvapp2-server" rule: "Host(`tvapp2.localhost`) || Host(`tvapp2.domain.lan`)" entryPoints: - http middlewares: - https-redirect@file - tvapp2-https: - service: "tvapp2" + tvapp2-server-https: + service: "tvapp2-server" rule: "Host(`tvapp2.localhost`) || Host(`tvapp2.domain.lan`)" entryPoints: - https @@ -325,6 +325,37 @@ http: - main: "domain.lan" sans: - "*.domain.lan" + # # + # @container TVApp2 › HDHomeRun + # @desc automatic M3U playlist and XML guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. + # @url https://github.com/TheBinaryNinja/tvapp2 + # + # remove / comment out the authentik line if you do not plan to use authentik: + # - authentik@file + # # + + tvapp2-hdhr-http: + service: "tvapp2-hdhr" + rule: "Host(`hdhr.localhost`) || Host(`hdhr.domain.lan`)" + entryPoints: + - http + middlewares: + - https-redirect@file + + tvapp2-hdhr-https: + service: "tvapp2-hdhr" + rule: "Host(`hdhr.localhost`) || Host(`hdhr.domain.lan`)" + entryPoints: + - https + middlewares: + - redirect-www@file + - authentik@file + tls: + certResolver: cloudflare + domains: + - main: "domain.lan" + sans: + - "*.domain.lan" # # # http › Services @@ -351,7 +382,12 @@ http: servers: - url: "http://plex:32400" - tvapp2: + tvapp2-server: + loadBalancer: + servers: + - url: "http://tvapp2:4124" + + tvapp2-hdhr: loadBalancer: servers: - url: "http://tvapp2:4124"