Rename music/flac volume to music/collection

README.md

@@ -166,7 +166,7 @@ All steps below are to be executed as the `music` user.
 ### Import new music
 
 1. Run `beet import /var/lib/yggdrasil/home/music/rip`. This will move the music files to
-   `/var/lib/yggdrasil/data/music/flac`.
+   `/var/lib/yggdrasil/data/music/collection`.
 2. Run `beet convert -a <match>`, where `<match>` is used to narrow down to new music only. This
    will convert the flac files into mp3 files for sharing via Nextcloud.
 3. Run `nextcloud-upload /var/tmp/music/mp3/<artist>` for every artist to upload to Nextcloud.

inventory/host_vars/yggdrasil/vars.yml

@@ -99,9 +99,11 @@ music_user_samba_password: "{{ vault_music_user_samba_password }}"
 
 music_user_home_directory: "{{ system_var_home_directory }}/{{ music_user_name }}"
 music_user_data_directory: "{{ system_var_data_directory }}/{{ music_user_name }}"
+music_user_data_collection_directory: "{{ music_user_data_directory }}/collection"
 
 music_user_home_dataset: "rpool{{ music_user_home_directory }}"
 music_user_data_dataset: "rpool{{ music_user_data_directory }}"
+music_user_data_collection_dataset: "{{ music_user_data_dataset }}/collection"
 
 # --------------------------------------------------------------------------------------------------
 # music:backups
@@ -144,7 +146,7 @@ services_host_services:
     address: "{{ vpn_bridge_prefix }}.6"
   music:
     address: "{{ vpn_bridge_prefix }}.7"
-    music_path: "{{ music_user_data_directory }}/flac"
+    music_path: "{{ music_user_data_collection_directory }}"
 
 # --------------------------------------------------------------------------------------------------
 # services:backups

playbooks/roles/music/datasets/meta/argument_specs.yml

@@ -11,3 +11,6 @@ argument_specs:
       music_user_data_dataset:
         type: "str"
         required: true
+      music_user_data_collection_dataset:
+        type: "str"
+        required: true

playbooks/roles/music/datasets/tasks/main.yml

@@ -21,9 +21,9 @@
     extra_zfs_properties:
       canmount: "off"
 
-- name: "create music volume dataset"
+- name: "create music collection dataset"
   community.general.zfs:
-    name: "{{ music_user_data_dataset }}/flac"
+    name: "{{ music_user_data_collection_dataset }}"
     state: "present"
 
 - name: "create backup data dataset"

playbooks/roles/music/org/meta/argument_specs.yml

@@ -8,7 +8,7 @@ argument_specs:
       music_user_home_directory:
         type: "str"
         required: true
-      music_user_data_directory:
+      music_user_data_collection_directory:
         type: "str"
         required: true
       music_user_nextcloud_domain:

playbooks/roles/music/org/templates/beets.yml

@@ -1,7 +1,7 @@
 plugins: convert fetchart info
-library: {{ music_user_data_directory }}/flac/library.db
+library: {{ music_user_data_collection_directory }}/library.db
 
-directory: {{ music_user_data_directory }}/flac
+directory: {{ music_user_data_collection_directory }}
 paths:
   default: $albumartist/$year $album%aunique{}/$track $title
   singleton: Non-Album/$artist/$title

playbooks/roles/music/rip/tasks/include/directories.yml

@@ -7,15 +7,15 @@
     group: "{{ music_user_name }}"
     mode: 0755
 
-- name: "directories : create volume \"flac\""
+- name: "directories : create collection directory"
   ansible.builtin.file:
-    path: "{{ music_user_data_directory }}/flac"
+    path: "{{ music_user_data_collection_directory }}"
     state: "directory"
     owner: "{{ music_user_name }}"
     group: "{{ music_user_name }}"
     mode: 0755
 
-- name: "directories : create directory \"rip\""
+- name: "directories : create rip directory"
   ansible.builtin.file:
     path: "{{ music_user_home_directory }}/rip"
     state: "directory"

playbooks/roles/music/rip/tasks/include/samba.yml

@@ -31,7 +31,7 @@
     block: |
       [music-archive]
          comment = Music archive
-         path = {{ music_user_data_directory }}/flac
+         path = {{ music_user_data_collection_directory }}
          browseable = yes
          read only = yes
   register: music_rip_samba_archive_config