diff --git a/roles/music/tasks/import_music.yml b/roles/music/tasks/import_music.yml index 4723dcf..46bc6a4 100644 --- a/roles/music/tasks/import_music.yml +++ b/roles/music/tasks/import_music.yml @@ -25,25 +25,9 @@ - name: Import music into Funkwhale shell: - cmd: "docker-compose run --rm api python manage.py import_files {{ funkwhale_import_library_id }} {{ funkwhale_import_music_directory }} --recursive --noinput --prune" chdir: "{{ funkwhale_folder_name }}" - -- name: Run funkwhale import container - community.docker.docker_compose: - project_src: "{{ funkwhale_folder_name }}" - files: ["import.yml"] - remove_orphans: yes - pull: yes - recreate: smart - state: present - -- name: Remove funkwhale import container - community.docker.docker_compose: - project_src: "{{ funkwhale_folder_name }}" - files: ["import.yml"] - state: absent - + - name: Delete files once imported shell: cmd: "rm -rf {{ funkwhale_import_music_directory_host }}/*" diff --git a/roles/music/tasks/main.yml b/roles/music/tasks/main.yml index 18779af..3d38385 100644 --- a/roles/music/tasks/main.yml +++ b/roles/music/tasks/main.yml @@ -41,7 +41,6 @@ mode: 0644 loop: - docker-compose.yml.j2 - - import.yml.j2 - conf.env.j2 - nginx.conf.j2 diff --git a/roles/music/templates/import.yml.j2 b/roles/music/templates/import.yml.j2 deleted file mode 100644 index 381d429..0000000 --- a/roles/music/templates/import.yml.j2 +++ /dev/null @@ -1,28 +0,0 @@ -version: "{{ compose_version }}" - -volumes: - frontend: - name: funkwhale_frontend - static: - name: funkwhale_static - -networks: - db: - name: funkwhale_db - -services: - api: - image: "funkwhale/funkwhale:{{ funkwhale_version }}" - container_name: funkwhale_import - networks: - - db - env_file: - - ./conf.env - volumes: - - "{{ funkwhale_import_music_directory_host }}:{{ funkwhale_import_music_directory }}:ro" - - "static:{{ funkwhale_static_root }}" - - "frontend:{{ funkwhale_frontend }}" - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - command: ["python", "manage.py", "import_files", "{{ funkwhale_import_library_id }}", "{{ funkwhale_import_music_directory }}", "--recursive", "--noinput", "--prune"] - restart: "no"