Merge branch 'PurpleNinja225-add-jellyfin'

* PurpleNinja225-add-jellyfin:
  mv jellyfin to roles

group_vars/all.yml

@@ -17,7 +17,6 @@
 ###
 
 # Media Sourcing
-jellyfin_enabled: false
 youtubedlmaterial_enabled: false
 
 # System Management
@@ -333,30 +332,6 @@ openhab_data_directory: "{{ docker_home }}/openhab"
 openhab_port_http: "7777"
 openhab_port_https: "7778"
 
-###
-### Jellyfin
-###
-# If you're paranoid, set permissions to "ro" so jellyfin won't ever be able to
-# delete your files
-jellyfin_available_externally: "false"
-jellyfin_config_directory: "{{ docker_home }}/jellyfin/config"
-jellyfin_movies_directory: "{{ movies_root }}"
-jellyfin_movies_permissions: "rw"
-jellyfin_music_directory: "{{ music_root }}"
-jellyfin_music_permissions: "rw"
-jellyfin_photos_directory: "{{ photos_root }}"
-jellyfin_photos_permissions: "rw"
-jellyfin_tv_directory: "{{ tv_root }}"
-jellyfin_tv_permissions: "rw"
-jellyfin_books_directory: "{{ books_root }}"
-jellyfin_books_permissions: "rw"
-jellyfin_audiobooks_directory: "{{ audiobooks_root }}"
-jellyfin_audiobooks_permissions: "rw"
-jellyfin_user_id: "0"
-jellyfin_group_id: "0"
-jellyfin_port_http: "8896"
-jellyfin_port_https: "8928"
-
 ###
 ### Ubooquity
 ###

nas.yml

@@ -148,20 +148,10 @@
         - homeassistant
       when: (homeassistant_enabled | default(False))
 
-    - role: homebridge
+    - role: jellyfin
       tags:
-        - homebridge
+        - jellyfin
-      when: (homebridge_enabled | default(False))
+      when: (jellyfin_enabled | default(False))
-
-    - role: jackett
-      tags:
-        - jackett
-      when: (jackett_enabled | default(False))
-
-    - role: komga
-      tags:
-        - komga
-      when: (komga_enabled | default(False))
 
     - role: lidarr
       tags:
@@ -366,10 +356,6 @@
       when: (openhab_enabled | default(False))
       tags: openhab
 
-    - import_tasks: tasks/jellyfin.yml
-      when: (jellyfin_enabled | default(False))
-      tags: jellyfin
-
     - import_tasks: tasks/krusader.yml
       when: (krusader_enabled | default(False))
       tags: krusader

roles/jellyfin/defaults/main.yml

@@ -0,0 +1,33 @@
+---
+# enable or disable the application
+jellyfin_enabled: false
+jellyfin_available_externally: "false"
+
+# directories
+jellyfin_config_directory: "{{ docker_home }}/jellyfin/config"
+jellyfin_movies_directory: "{{ movies_root }}"
+jellyfin_music_directory: "{{ music_root }}"
+jellyfin_photos_directory: "{{ photos_root }}"
+jellyfin_tv_directory: "{{ tv_root }}"
+jellyfin_books_directory: "{{ books_root }}"
+jellyfin_audiobooks_directory: "{{ audiobooks_root }}"
+
+# permissions
+jellyfin_movies_permissions: "rw"
+jellyfin_music_permissions: "rw"
+jellyfin_photos_permissions: "rw"
+jellyfin_tv_permissions: "rw"
+jellyfin_books_permissions: "rw"
+jellyfin_audiobooks_permissions: "rw"
+
+# uid / gid
+jellyfin_user_id: "0"
+jellyfin_group_id: "0"
+
+# network
+jellyfin_hostname: "jellyfin"
+jellyfin_port_http: "8896"
+jellyfin_port_https: "8928"
+
+# specs
+jellyfin_memory: "1g"

roles/jellyfin/tasks/main.yml

@@ -27,10 +27,10 @@
       PUID: "{{ jellyfin_user_id }}"
       PGID: "{{ jellyfin_group_id }}"
     restart_policy: unless-stopped
-    memory: 1g
+    memory: "{{ jellyfin_memory }}"
     labels:
       traefik.enable: "{{ jellyfin_available_externally }}"
-      traefik.http.routers.jellyfin.rule: "Host(`jellyfin.{{ ansible_nas_domain }}`)"
+      traefik.http.routers.jellyfin.rule: "Host(`{{ jellyfin_hostname }}.{{ ansible_nas_domain }}`)"
       traefik.http.routers.jellyfin.tls.certresolver: "letsencrypt"
       traefik.http.routers.jellyfin.tls.domains[0].main: "{{ ansible_nas_domain }}"
       traefik.http.routers.jellyfin.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"