From 783b21aa1a41f32c7fe3c0926ed1c0e704eb59c6 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 24 Apr 2020 19:00:06 +0200
Subject: [PATCH] Update to 2020-04-24 19:00

---
 roles/funkwhale/defaults/main.yml                           | 8 ++++----
 roles/funkwhale/templates/env.j2                            | 1 +
 roles/funkwhale/templates/funkwhale-update-media.service.j2 | 4 +---
 roles/includes/webapps_set_install_mode.yml                 | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/roles/funkwhale/defaults/main.yml b/roles/funkwhale/defaults/main.yml
index 4d2e6f0..da11c28 100644
--- a/roles/funkwhale/defaults/main.yml
+++ b/roles/funkwhale/defaults/main.yml
@@ -1,12 +1,12 @@
 ---
 
-funkwhale_version: 0.20.1
+funkwhale_version: 0.21
 funkwhale_id: 1
 #funkwhale_archive_url: https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/{{ funkwhale_version }}/funkwhale-{{ funkwhale_version }}.tar.gz
 funkwhale_base_url: https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/{{ funkwhale_version }}/download
 funkwhale_archive_sha1:
-  api: 0fc2f0152c18bff3d33410d299b2c67f8a4fe101
-  front: dc9094508048176ed9f7fe819d6d5e92ed415511
+  api: 603563d24e8188aa41c7e4e6c244fa5ad8eef8ed
+  front: 9c288d51c3bda39ab4ef90669c4aaf38d3f6ed27
 funkwhale_root_dir: /opt/funkwhale_{{ funkwhale_id }}
 
 # Should ansible manage upgrades of funkwhale, or only initial install
@@ -50,5 +50,5 @@ funkwhale_libraries: []
 #     path: /opt/funkwhale/data/music
 #     inplace: True
 
-# Increase on busy servers (but will require more memory
+# Increase on busy servers (but will require more memory)
 funkwhale_web_workers: 1
diff --git a/roles/funkwhale/templates/env.j2 b/roles/funkwhale/templates/env.j2
index fd42a4c..41b034a 100644
--- a/roles/funkwhale/templates/env.j2
+++ b/roles/funkwhale/templates/env.j2
@@ -30,3 +30,4 @@ LDAP_USER_ATTR_MAP='{{ funkwhale_ldap_attr_map }}'
 FUNKWHALE_FRONTEND_PATH={{ funkwhale_root_dir }}/front/dist
 NGINX_MAX_BODY_SIZE=100M
 MUSIC_USE_DENORMALIZATION=True
+FUNKWHALE_SPA_HTML_ROOT={{ funkwhale_root_dir }}/front/dist/
diff --git a/roles/funkwhale/templates/funkwhale-update-media.service.j2 b/roles/funkwhale/templates/funkwhale-update-media.service.j2
index 972ea32..b101f71 100644
--- a/roles/funkwhale/templates/funkwhale-update-media.service.j2
+++ b/roles/funkwhale/templates/funkwhale-update-media.service.j2
@@ -8,9 +8,7 @@ ExecStart={{ funkwhale_root_dir }}/venv/bin/python \
             {{ funkwhale_root_dir }}/api/manage.py \
             import_files {{ lib.id }} \
             --no-input{% if lib.inplace %} --in-place{% endif %} \
-{% for format in [ 'mp3', 'MP3', 'ogg', 'OGG', 'flac', 'FLAC' ] %}
-            "{{ lib.path | regex_replace('/$', '') }}/**/*.{{ format }}" \
-{% endfor %}
+            "{{ lib.path }}" \
             --recursive
 {% endfor %}
 ExecStart={{ funkwhale_root_dir }}/venv/bin/python \
diff --git a/roles/includes/webapps_set_install_mode.yml b/roles/includes/webapps_set_install_mode.yml
index c1e2281..d3bfa31 100644
--- a/roles/includes/webapps_set_install_mode.yml
+++ b/roles/includes/webapps_set_install_mode.yml
@@ -23,5 +23,5 @@
   set_fact: install_mode='upgrade'
   when:
     - version_file.stat.exists
-    - current_version != version
+    - current_version | string != version | string
     - manage_upgrade | default(True)