Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Fix DLNA and HDHR for Traefik Docker compose #168

Merged
merged 5 commits into from
Dec 31, 2019

Conversation

PrplHaz4
Copy link
Contributor

@PrplHaz4 PrplHaz4 commented Dec 5, 2019

Based on the changes proposed by @Artiume

  • Moved Traefik and Jellyfin to a single docker-compose.yml
  • Removed some config items
  • Added functional host networking so DLNA and LiveTV work
  • Used static rules to point to docker host from Traefik network
  • Changed docker-compose version to 3.5 (to support network name) - there are other workarounds but this is more copy/paste friendly

Based on the changes proposed by @Artiume 

- Moved Traefik and Jellyfin to a single docker-compose.yml
- Removed some config items
- Added functional host networking so DLNA and LiveTV work
- Used static rules to point to docker host from Traefik network
- Changed docker-compose version to 3.5 (to support network name) - there are other workarounds but this is more copy/paste friendly
@PrplHaz4 PrplHaz4 mentioned this pull request Dec 5, 2019
@PrplHaz4
Copy link
Contributor Author

PrplHaz4 commented Dec 5, 2019

I think /acme.json is the right mount

I thought so too, but all the Traefik docs show it this way, and it seems to be working for me locally, so I'm going to leave it unless someone reports it being broken.

https://github.com/containous/traefik/blob/v1.7/docs/user-guide/docker-and-lets-encrypt.md

Grouping here is weird - alternative to this would be to move Certbot instructions under the RP they apply to (Apache/HAproxy/Nginx)...
@JustAMan
Copy link
Contributor

@PrplHaz4 please verify that your PR and #170 don't clash over DLNA documentation :)

@PrplHaz4
Copy link
Contributor Author

@JustAMan no conflicts that I see - @Artiume and I talked about the changes prior to this PR...

@anthonylavado anthonylavado requested a review from a team December 14, 2019 08:01
general/administration/reverse-proxy.md Outdated Show resolved Hide resolved
general/administration/reverse-proxy.md Show resolved Hide resolved
@PrplHaz4
Copy link
Contributor Author

Sorry @oddstr13 - my intention was to have atomic commits that could be reviewed independently (or thrown out) without making a bunch of PRs. The first commit is the real meat of this issue.

I'll change to example.com and move reordering to another PR.

Agree they should all be on their own pages - but that will also require someone to dissect lets encrypt into nginx and apache pages (or DRY and put it on its own page).

@PrplHaz4
Copy link
Contributor Author

@oddstr13 I think I'm going back on undoing the ordering - the current order makes no sense and is confusing:

  • Apache
  • HAProxy
  • Nginx
  • Caddy
  • Lets Encrypt with Certbot
    • Apache
    • HAProxy
    • Nginx
  • Traefik

My change does this (so at least the high level list of reverse proxies is consistent - certbot instructions for each proxy are moved to the bottom):

  • Apache
  • HAProxy
  • Nginx
  • Caddy
  • Traefik
  • Lets Encrypt with Certbot
    • Apache
    • HAProxy
    • Nginx

IMO, this is a reasonable stopgap solution until each RP is moved to its own page (and will hopefully help lots of the issues people are having with Traefik/--net=host.

Copy link
Contributor

@oddstr13 oddstr13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know the specifics of docker-compose or Træfik, but looks good to me.

@dkanada dkanada merged commit a766528 into jellyfin-archive:master Dec 31, 2019
@PrplHaz4 PrplHaz4 deleted the patch-3 branch December 31, 2019 22:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants