From d65672152cee402b373832985d6e1761988942c6 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 19 Nov 2021 10:00:08 +0100 Subject: [PATCH] Update to 2021-11-19 10:00 --- roles/glpi/templates/logrotate.conf.j2 | 1 + roles/navidrome/defaults/main.yml | 4 ++-- roles/seafile/templates/ccnet.conf.j2 | 2 ++ roles/seafile/templates/seafile.conf.j2 | 3 +++ roles/seafile/templates/seahub_settings.py.j2 | 5 +++++ roles/seafile/vars/RedHat-8.yml | 2 ++ 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/roles/glpi/templates/logrotate.conf.j2 b/roles/glpi/templates/logrotate.conf.j2 index a188039..cd4cdcd 100644 --- a/roles/glpi/templates/logrotate.conf.j2 +++ b/roles/glpi/templates/logrotate.conf.j2 @@ -3,4 +3,5 @@ rotate 90 compress missingok + su {{ glpi_php_user }} {{ glpi_php_user }} } diff --git a/roles/navidrome/defaults/main.yml b/roles/navidrome/defaults/main.yml index 2577c4b..c6aeebc 100644 --- a/roles/navidrome/defaults/main.yml +++ b/roles/navidrome/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to deploy -nd_version: 0.46.0 +nd_version: 0.47.0 # URL of the archive nd_archive_url: https://github.com/navidrome/navidrome/releases/download/v{{ nd_version }}/navidrome_{{ nd_version }}_Linux_x86_64.tar.gz # Expected sha1 of the archive -nd_archive_sha1: 5e851b3703d5a4c109b5073a7bcadb590d8049be +nd_archive_sha1: 3d06456e26953931399d001f1d3c412f48ac9f34 # Should ansible handle upgrades, or only initial install ? nd_manage_upgrade: True diff --git a/roles/seafile/templates/ccnet.conf.j2 b/roles/seafile/templates/ccnet.conf.j2 index e457aa9..d153140 100644 --- a/roles/seafile/templates/ccnet.conf.j2 +++ b/roles/seafile/templates/ccnet.conf.j2 @@ -2,7 +2,9 @@ USER_NAME = {{ seafile_user }} ID = {{ seafile_ccnet_id }} NAME = seafile +{% if seafile_version is version('9.0.0', '<') %} SERVICE_URL = {{ seafile_public_url }} +{% endif %} [Database] ENGINE = mysql diff --git a/roles/seafile/templates/seafile.conf.j2 b/roles/seafile/templates/seafile.conf.j2 index f644667..32bf0cb 100644 --- a/roles/seafile/templates/seafile.conf.j2 +++ b/roles/seafile/templates/seafile.conf.j2 @@ -29,6 +29,9 @@ max_upload_size = {{ seafile_max_upload_size }} max_download_dir_size = {{ seafile_max_download_dir_size }} {% endif %} web_token_expire_time = 7200 +{% if seafile_version is version('9.0.0', '>=') %} +use_go_fileserver = true +{% endif %} {% if seafile_license is defined and seafile_scan_av == True %} [virus_scan] diff --git a/roles/seafile/templates/seahub_settings.py.j2 b/roles/seafile/templates/seahub_settings.py.j2 index 8c8f675..64e1565 100644 --- a/roles/seafile/templates/seahub_settings.py.j2 +++ b/roles/seafile/templates/seahub_settings.py.j2 @@ -1,4 +1,9 @@ # -*- coding: utf-8 -*- + +{% if seafile_version is version('9.0.0', '>=') %} +SERVICE_URL = '{{ seafile_public_url }}' +{% endif %} + SECRET_KEY = "{{ seafile_seahub_secret }}" DATABASES = { diff --git a/roles/seafile/vars/RedHat-8.yml b/roles/seafile/vars/RedHat-8.yml index bdc260c..65edb83 100644 --- a/roles/seafile/vars/RedHat-8.yml +++ b/roles/seafile/vars/RedHat-8.yml @@ -41,3 +41,5 @@ seafile_rm_libs: - liblber-2.4.so.2 - libldap-2.4.so.2 - libsasl2.so.3 + - libldap_r-2.4.so.2 # 9.0.0 + - libcrypto.so.1.1 # 9.0.0