From c5475b8881b7b68cdf34fa1732a677c9110fe7eb Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 5 Feb 2021 19:00:07 +0100
Subject: [PATCH] Update to 2021-02-05 19:00

---
 roles/ampache/defaults/main.yml            | 6 +++---
 roles/ampache/templates/ampache.cfg.php.j2 | 3 ++-
 roles/ampache/templates/php.conf.j2        | 2 +-
 roles/n8n/defaults/main.yml                | 2 +-
 roles/n8n/tasks/archive_post.yml           | 2 +-
 roles/n8n/tasks/archive_pre.yml            | 2 +-
 roles/n8n/tasks/install.yml                | 1 +
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/roles/ampache/defaults/main.yml b/roles/ampache/defaults/main.yml
index 8493aa1..2234a39 100644
--- a/roles/ampache/defaults/main.yml
+++ b/roles/ampache/defaults/main.yml
@@ -3,10 +3,10 @@
 ampache_id: "1"
 ampache_manage_upgrade: True
 
-ampache_version: '4.2.6'
-ampache_config_version: 45
+ampache_version: '4.3.0'
+ampache_config_version: 46
 ampache_zip_url: https://github.com/ampache/ampache/releases/download/{{ ampache_version }}/ampache-{{ ampache_version }}_all.zip
-ampache_zip_sha1: 00568fda3cd47c8f9fc68a6ee333d60155f28b18
+ampache_zip_sha1: d8ffee09a0dd45b68ac678fa1f043f63ff7a0949
 
 ampache_root_dir: /opt/ampache_{{ ampache_id }}
 
diff --git a/roles/ampache/templates/ampache.cfg.php.j2 b/roles/ampache/templates/ampache.cfg.php.j2
index 719a0cc..cb40e04 100644
--- a/roles/ampache/templates/ampache.cfg.php.j2
+++ b/roles/ampache/templates/ampache.cfg.php.j2
@@ -37,7 +37,7 @@ require_localnet_session = "true"
 metadata_order = "{{ ampache_metadata_order }}"
 getid3_tag_order = "id3v2,id3v1,vorbiscomment,quicktime,matroska,ape,asf,avi,mpeg,riff"
 deferred_ext_metadata = "false"
-additional_genre_delimiters = "[/]{2}|[/|\\\\|\|,|;]"
+additional_genre_delimiters = "[/]{2}|[/\\\\|,;]"
 catalog_file_pattern = "mp3|mpc|m4p|m4a|aac|ogg|oga|wav|aif|aiff|rm|wma|asf|flac|opus|spx|ra|ape|shn|wv"
 catalog_video_pattern = "avi|mpg|mpeg|flv|m4v|mp4|webm|mkv|wmv|ogv|mov|divx|m2ts"
 catalog_playlist_pattern = "m3u|m3u8|pls|asx|xspf"
@@ -130,3 +130,4 @@ proxy_port = "{{ system_proxy | urlsplit('port') }}"
 proxy_user = "{{ system_proxy | urlsplit('username') }}"
 proxy_pass = "{{ system_proxy | urlsplit('password') }}"
 {% endif %}
+
diff --git a/roles/ampache/templates/php.conf.j2 b/roles/ampache/templates/php.conf.j2
index a7d2398..6c17756 100644
--- a/roles/ampache/templates/php.conf.j2
+++ b/roles/ampache/templates/php.conf.j2
@@ -27,7 +27,7 @@ php_admin_value[upload_tmp_dir] = {{ ampache_root_dir }}/tmp
 php_admin_value[sys_temp_dir] = {{ ampache_root_dir }}/tmp
 php_admin_value[post_max_size] = 5M
 php_admin_value[upload_max_filesize] = 5M
-php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
+php_admin_value[disable_functions] = system, show_source, symlink, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
 php_admin_value[open_basedir] = {{ ampache_root_dir }}
 php_admin_value[max_execution_time] = 1800
 php_admin_value[max_input_time] = 60
diff --git a/roles/n8n/defaults/main.yml b/roles/n8n/defaults/main.yml
index 845464c..c933a9c 100644
--- a/roles/n8n/defaults/main.yml
+++ b/roles/n8n/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Version to deploy
-n8n_version: 0.105.0
+n8n_version: 0.106.0
 # Root directory where n8n will be installed
 n8n_root_dir: /opt/n8n
 # User account under which n8n will run
diff --git a/roles/n8n/tasks/archive_post.yml b/roles/n8n/tasks/archive_post.yml
index 3fc97fd..4c7f5a6 100644
--- a/roles/n8n/tasks/archive_post.yml
+++ b/roles/n8n/tasks/archive_post.yml
@@ -5,6 +5,6 @@
   environment:
     ZST_CLEVEL: 10
   args:
-    chdir: "{{ n8n_archive_dir }}"
+    chdir: "{{ n8n_root_dir }}/archives/{{ n8n_current_version }}"
     warn: False
   tags: n8n
diff --git a/roles/n8n/tasks/archive_pre.yml b/roles/n8n/tasks/archive_pre.yml
index dd955eb..563c042 100644
--- a/roles/n8n/tasks/archive_pre.yml
+++ b/roles/n8n/tasks/archive_pre.yml
@@ -22,7 +22,7 @@
 - name: Dump the database
   mysql_db:
     state: dump
-    name: "{{ item }}"
+    name: "{{ n8n_db_name }}"
     target: "{{ n8n_root_dir }}/archives/{{ n8n_current_version }}/{{ n8n_db_name }}.sql.xz"
     login_host: "{{ n8n_db_server }}"
     login_port: "{{ n8n_db_port }}"
diff --git a/roles/n8n/tasks/install.yml b/roles/n8n/tasks/install.yml
index 7dbdf1c..7d84f60 100644
--- a/roles/n8n/tasks/install.yml
+++ b/roles/n8n/tasks/install.yml
@@ -19,6 +19,7 @@
   environment:
     - npm_config_python: /bin/python3 # This is needed for sqlite3 build
   become_user: "{{ n8n_user }}"
+  notify: restart n8n
   tags: n8n
 
 # Create the database