Merge pull request #10 from rubycats-com/jellyfin-http

jellyfin use http

Author: ineedjet

apps/common.yml

@@ -28,10 +28,20 @@ x-healthcheck: &healthcheck
   retries: 5
 x-labels: &labels
   - "traefik.enable=true"
+  - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+  - "traefik.http.middlewares.redirect-to-https.redirectscheme.permanent=false"
+  - "traefik.http.routers.${APP_NAME}-http.rule=Host(`${APP_NAME}.${DAPPS_DOMAIN}`)"
+  - "traefik.http.routers.${APP_NAME}-http.entrypoints=http"
+  - "traefik.http.routers.${APP_NAME}-http.middlewares=redirect-to-https"
   - "traefik.http.routers.${APP_NAME}.rule=Host(`${APP_NAME}.${DAPPS_DOMAIN}`)"
   - "traefik.http.routers.${APP_NAME}.entrypoints=https"
   - "traefik.http.routers.${APP_NAME}.tls.certresolver=${DAPPS_CERTIFICATE_RESOLVER}"
   - "traefik.http.services.${APP_NAME}.loadbalancer.server.port=${APP_PORT}"
+x-labels-http: &labels-http
+  - "traefik.enable=true"
+  - "traefik.http.routers.${APP_NAME}.rule=Host(`${APP_NAME}.${DAPPS_DOMAIN}`)"
+  - "traefik.http.routers.${APP_NAME}.entrypoints=http"
+  - "traefik.http.services.${APP_NAME}.loadbalancer.server.port=${APP_PORT}"
 x-labels-api: &labels-api
   - traefik.enable=true
   - traefik.http.routers.${APP_NAME}-api.rule=Host(`${APP_NAME}.${DAPPS_DOMAIN}`) && PathPrefix(`/api`)
@@ -57,6 +67,17 @@ services:
       - internal
       - traefik
     logging: *logging
+  main-http:
+    env_file: *env-file
+    restart: *restart
+    expose:
+      - ${APP_PORT}
+    labels: *labels-http
+    healthcheck: *healthcheck
+    networks:
+      - internal
+      - traefik
+    logging: *logging
   api:
     env_file: *env-file
     restart: *restart

apps/jellyfin/docker-compose.yml

@@ -2,13 +2,13 @@ include:
   - ../networks.yml
 x-environment: &environment
   TZ: ${DAPPS_TIMEZONE}
-  JELLYFIN_PublishedServerUrl: https://${APP_NAME}.${DAPPS_DOMAIN}
+  JELLYFIN_PublishedServerUrl: http://${APP_NAME}.${DAPPS_DOMAIN}
 services:
   jellyfin:
     image: jellyfin/jellyfin
     extends:
       file: ../common.yml
-      service: main
+      service: main-http
     environment: *environment
     volumes:
       - ../../apps-data/${APP_NAME}/config:/config

apps/traefik/config/traefik.template.yml

@@ -13,12 +13,6 @@ ping:
 entryPoints:
   http:
     address: ":80"
-    http:
-      redirections:
-        entryPoint:
-          to: https
-          scheme: https
-          permanent: false
   https:
     address: ":443"
     forwardedHeaders: