Merge branch 'main' into jfa

.drone.yml

@@ -1,39 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm-test.autonomic.zone
-steps:
-  - name: deployment
-    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
-    settings:
-      host: swarm-test.autonomic.zone
-      stack: jellyfin
-      generate_secrets: true
-      purge: true
-      deploy_key:
-        from_secret: drone_ssh_swarm_test
-      networks:
-        - proxy
-    environment:
-      DOMAIN: jellyfin.swarm-test.autonomic.zone
-      STACK_NAME: jellyfin
-      LETS_ENCRYPT_ENV: production
-      EXTRA_VOLUME: "/dev/null:/tmp/.dummy"
-trigger:
-  branch:
-    - main
----
-kind: pipeline
-name: generate recipe catalogue
-steps:
-  - name: release a new version
-    image: plugins/downstream
-    settings:
-      server: https://build.coopcloud.tech
-      token:
-        from_secret: drone_abra-bot_token
-      fork: true
-      repositories:
-        - toolshed/auto-recipes-catalogue-json
-
-trigger:
-  event: tag

.env.sample

@@ -5,14 +5,10 @@ DOMAIN=jellyfin.example.com
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.jellyfin.example.com`'
 
-COMPOSE_FILE="compose.yml"
-
 LETS_ENCRYPT_ENV=production
 
-# You can set to an existing path on the host, and define a path inside the container
+# Set to an existing path on the host, and define a path inside the container
 EXTRA_VOLUME=/dev/null:/tmp/.dummy
 
-# uncomment below to refer to the radarr and sonarr volumes
-# COMPOSE_FILE="$COMPOSE_FILE:compose.media_volumes.yml"
-# movies_volume=<radarr_app>_tv
-# shows_volume=<sonarr_app>_tv
+COMPOSE_FILE="compose.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.jfa.yml"

README.md

@@ -29,19 +29,7 @@ For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
 You can mount a folder of your choice to jellyfin by editing this line after running `abra app config ${your jelllyfin url}`
 
 ```
-EXTRA_VOLUME=/home/$USER/media:/media/ # replace /home/$USER/media with folder of your  choice
+EXTRA_VOLUME=/home/aadil/media:/media/ # replace /home/aadil/media with folder of your  choice
 ```
 
-Then during the jellyfin setup wizard use this folder as the path for your jellyfin library.
-
-## Use with sonarr and radarr
-
-TODO: better documentation for the installation process could be needed.
-
-After installing the recipes below, you will need to use their web installation guide to conenct services, identify root folders ™, register some indexers ... etc
-
-1. [qbit](https://recipes.coopcloud.tech/qbit): the torrent fownload client.
-1. [prowlarr](https://recipes.coopcloud.tech/prowlarr): makes registering indexers easy for torrent indexers.
-1. [sonarr](https://recipes.coopcloud.tech/sonarr): scans indexers for shows.
-1. [radarr](https://recipes.coopcloud.tech/radarr): scans indexers for movies.
-1. [jellyseer](https://recipes.coopcloud.tech/jellyseerr): the piece that holds it all together.
+Then during the jellyfin setup wizard use this folder as the path for your jellyfin library.

compose.jfa.yml

@@ -0,0 +1,30 @@
+---
+version: "3.8"
+
+services:
+  accounts:
+    image: hrfee/jfa-go
+    entrypoint: ["/opt/jfa-go/jfa-go", "-data", "/data", "-debug"]
+    networks:
+      - proxy
+    volumes:
+      # - jellyfin_config:/jf
+      - jfa:/data
+    deploy:
+      restart_policy:
+        condition: on-failure
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.services.${STACK_NAME}_admin.loadbalancer.server.port=8056"
+        - "traefik.http.routers.${STACK_NAME}_admin.rule=Host(`admin.${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}_admin.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}_admin.tls.certresolver=${LETS_ENCRYPT_ENV}"
+
+networks:
+  proxy:
+    external: true
+
+volumes:
+  jfa:
+  jellyfin_config:
+    external: true

compose.media_volumes.yml

@@ -1,14 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    volumes:
-      - media_movies:/movies
-      - media_shows:/shows
-
-volumes:
-  media_movies:
-    name: $movies_volume
-  media_shows:
-    name: $shows_volume

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: jellyfin/jellyfin:10.10.5
+    image: jellyfin/jellyfin:10.8.5
     environment:
       - JELLYFIN_PublishedServerUrl=https://${DOMAIN}
     networks:
@@ -25,7 +25,7 @@ services:
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=0.4.2+10.10.5" 
+        - "coop-cloud.${STACK_NAME}.version=0.1.2+10.8.5"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost:8096"]
     #   interval: 30s