Merge branch 'master' into add-jellyfin

group_vars/all.yml

@@ -25,11 +25,10 @@ tautulli_enabled: false
 # Media Sourcing
 get_iplayer_enabled: false
 jackett_enabled: false
-minidlna_enabled: false
+
 
 
 youtubedlmaterial_enabled: false
-mylar_enabled: false
 
 # Music
 mymediaforalexa_enabled: false
@@ -155,7 +154,9 @@ samba_shares:
     guest_ok: yes
     public: yes
     writable: yes
-    browseable: yes
+    browseable: yes> and do *all* customizations have to go in the single nas.yml file? can they not be split up somehow in the inventory/nas/group_vars folder?
+
+ansi
     path: "{{ tv_root }}"
 
   - name: music
@@ -311,18 +312,6 @@ tautulli_user_id: "0"
 tautulli_group_id: "0"
 tautulli_port: "8185"
 
-###
-### Mylar
-###
-mylar_available_externally: "false"
-mylar_data_directory: "{{ docker_home }}/mylar"
-mylar_comics_directory: "{{ comics_root }}"
-mylar_downloads_directory: "{{ downloads_root }}"
-mylar_port_http: "8585"
-mylar_user_id: "0"
-mylar_group_id: "0"
-
-
 ###
 ### YouTubeDL-Material
 ###
@@ -434,14 +423,6 @@ timemachine_share_name: Data
 timemachine_log_level: error
 timemachine_port: "10445"
 
-###
-### MiniDLNA
-###
-minidlna_media_directory1: "{{ movies_root }}"
-minidlna_media_directory2: "{{ tv_root }}"
-minidlna_friendly_name: "{{ ansible_nas_hostname }}"
-minidlna_port: "8201"
-
 ###
 ### get_iplayer
 ###

nas.yml

@@ -108,6 +108,16 @@
         - lidarr
       when: (lidarr_enabled | default(False))
 
+   - role: minidlna
+      tags:
+        - minidlna
+      when: (minidlna_enabled | default(False))
+
+    - role: mylar
+      tags:
+        - mylar
+      when: (mylar_enabled | default(False))
+
     - role: n8n
       tags:
         - n8n_enabled
@@ -210,10 +220,6 @@
     when: (thelounge_enabled | default(False))
     tags: thelounge
 
-  - import_tasks: tasks/mylar.yml
-    when: (mylar_enabled | default(False))
-    tags: mylar
-
   - import_tasks: tasks/glances.yml
     when: (glances_enabled | default(False))
     tags: glances
@@ -242,10 +248,6 @@
     when: (guacamole_enabled | default(False))
     tags: guacamole
 
-  - import_tasks: tasks/minidlna.yml
-    when: (minidlna_enabled | default(False))
-    tags: minidlna
-
   - import_tasks: tasks/get_iplayer.yml
     when: (get_iplayer_enabled | default(False))
     tags: get_iplayer

roles/minidlna/defaults/main.yml

@@ -0,0 +1,15 @@
+---
+# enable or disable the application
+minidlna_enabled: false
+minidlna_available_externally: "false"
+
+# directories
+minidlna_media_directory1: "{{ movies_root }}"
+minidlna_media_directory2: "{{ tv_root }}"
+
+# network
+minidlna_friendly_name: "{{ ansible_nas_hostname }}"
+minidlna_port: "8201"
+
+# specs
+minidlna_memory: "1g"

roles/minidlna/tasks/main.yml

@@ -1,3 +1,4 @@
+---
 - name: MiniDLNA Docker Container
   docker_container:
     name: minidlna
@@ -10,7 +11,7 @@
       MINIDLNA_MEDIA_DIR1: "/media1"
       MINIDLNA_MEDIA_DIR2: "/media2"
       MINIDLNA_FRIENDLY_NAME: "{{ minidlna_friendly_name }}"
-      MINIDLNA_PORT: "8201"
-    network_mode: host
+      MINIDLNA_PORT: "{{ minidlna_port }}"
     restart_policy: unless-stopped
-    memory: 1g
+    network_mode: host
+    memory: "{{ minidlna_memory }}"

roles/mylar/defaults/main.yml

@@ -0,0 +1,21 @@
+---
+# enable or disable the application
+mylar_enabled: false
+mylar_available_externally: "false"
+
+# directories
+mylar_data_directory: "{{ docker_home }}/mylar"
+mylar_comics_directory: "{{ comics_root }}"
+mylar_downloads_directory: "{{ downloads_root }}"
+
+
+# uid / gid
+mylar_user_id: "0"
+mylar_group_id: "0"
+
+# network
+mylar_hostname: "mylar"
+mylar_port_http: "8585"
+
+# specs
+mylar_memory: "1g"

roles/mylar/tasks/main.yml

@@ -1,12 +1,13 @@
 ---
-- name: Create Mylar Directory
+- name: Create Mylar Directories
   file:
     path: "{{ item }}"
     state: directory
+    # mode: 0755
   with_items:
     - "{{ mylar_data_directory }}/config"
 
-- name: Mylar
+- name: mylar Docker Container
   docker_container:
     name: mylar
     image: linuxserver/mylar
@@ -15,6 +16,7 @@
       - "{{ mylar_comics_directory }}:/comics:rw"
       - "{{ mylar_downloads_directory }}:/downloads:rw"
       - "{{ mylar_data_directory }}/config:/config:rw"
+    network_mode: "bridge"
     ports:
       - "{{ mylar_port_http }}:8090"
     env:
@@ -22,10 +24,10 @@
       PUID: "{{ mylar_user_id }}"
       PGID: "{{ mylar_group_id }}"
     restart_policy: unless-stopped
-    memory: 1g
+    memory: "{{ mylar_memory }}"
     labels:
       traefik.enable: "{{ mylar_available_externally }}"
-      traefik.http.routers.mylar.rule: "Host(`mylar.{{ ansible_nas_domain }}`)"
+      traefik.http.routers.mylar.rule: "Host(`{{ mylar_hostname }}.{{ ansible_nas_domain }}`)"
       traefik.http.routers.mylar.tls.certresolver: "letsencrypt"
       traefik.http.routers.mylar.tls.domains[0].main: "{{ ansible_nas_domain }}"
       traefik.http.routers.mylar.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"