Update to 2020-07-27 16:00

4 years ago · 592e3d1a37
parent f00f450af4
commit 592e3d1a37
4 changed files with 10 additions and 9 deletions
--- a/roles/funkwhale/defaults/main.yml
+++ b/roles/funkwhale/defaults/main.yml
@ -1,12 +1,12 @@
 ---

-funkwhale_version: 0.21.1
+funkwhale_version: 0.21.2
 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: bf5f4a700ba45ccd3ddd7f113cc95074fc4e7143
-  front: ea0ea7469096255ba2b3fa6674f90299e2e4dac9
+  api: 7411d5e506ab1f720202ec77e0a7b26f2d146ebb
+  front: a2b0b62c2311258675a74abebfef495e1d8a49a9
 funkwhale_root_dir: /opt/funkwhale_{{ funkwhale_id }}

 # Should ansible manage upgrades of funkwhale, or only initial install
--- a/roles/funkwhale/tasks/main.yml
+++ b/roles/funkwhale/tasks/main.yml
@ -5,7 +5,7 @@
    name:
      - gcc
      - git
-      - postgresql11
+      - postgresql12
      - postgresql-devel
      - openldap-devel
      - cyrus-sasl-devel
@ -66,7 +66,7 @@
    - dir: tmp
      mode: 700
    - dir: venv
-    - dir: db_dumps
+    - dir: backup
      mode: 700
  tags: funkwhale

@ -90,7 +90,7 @@

 - name: Archive a database dump
  command: >
-    /usr/pgsql-11/bin/pg_dump
+    /usr/pgsql-12/bin/pg_dump
    --clean
    --host={{ funkwhale_db_server }}
    --port={{ funkwhale_db_port }}
@ -314,4 +314,5 @@
    - tmp/front.zip
    - tmp/front
    - archives/{{ funkwhale_current_version }}
+    - db_dumps
  tags: funkwhale
--- a/roles/funkwhale/templates/post-backup.sh.j2
+++ b/roles/funkwhale/templates/post-backup.sh.j2
@ -1,3 +1,3 @@
 #!/bin/bash -e

-rm -f {{ funkwhale_root_dir }}/db_dumps/{{ funkwhale_db_name }}.sql.lz4
+rm -f {{ funkwhale_root_dir }}/backup/{{ funkwhale_db_name }}.sql.zst
--- a/roles/funkwhale/templates/pre-backup.sh.j2
+++ b/roles/funkwhale/templates/pre-backup.sh.j2
@ -1,8 +1,8 @@
 #!/bin/bash -e

-PGPASSWORD='{{ funkwhale_db_pass }}' /usr/pgsql-11/bin/pg_dump \
+PGPASSWORD='{{ funkwhale_db_pass }}' /usr/pgsql-12/bin/pg_dump \
  --clean \
  --username={{ funkwhale_db_user }} \
  --host={{ funkwhale_db_server }} \
  {{ funkwhale_db_name }} | \
-  lz4 -c > {{ funkwhale_root_dir }}/db_dumps/{{ funkwhale_db_name }}.sql.lz4
+  zstd -c > {{ funkwhale_root_dir }}/backup/{{ funkwhale_db_name }}.sql.zst