From 4fc2784765cc4d4798b0c5a13e8aff8b6196ec9a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 28 Feb 2022 14:00:06 +0100 Subject: [PATCH] Update to 2022-02-28 14:00 --- roles/funkwhale/tasks/main.yml | 34 ++++++++++------ .../templates/lemonldap-ng.ini.j2 | 3 +- roles/seafile/tasks/main.yml | 40 ++++++++++++------- 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/roles/funkwhale/tasks/main.yml b/roles/funkwhale/tasks/main.yml index 7a3ac5a..a375c69 100644 --- a/roles/funkwhale/tasks/main.yml +++ b/roles/funkwhale/tasks/main.yml @@ -1,14 +1,24 @@ --- -- include: user.yml -- include: directories.yml -- include: facts.yml -- include: archive_pre.yml - when: funkwhale_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: service.yml -- include: write_version.yml -- include: archive_post.yml - when: funkwhale_install_mode == 'upgrade' -- include: cleanup.yml +- include_tasks: user.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: archive_pre.yml + when: funkwhale_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: service.yml + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: archive_post.yml + when: funkwhale_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/lemonldap_ng/templates/lemonldap-ng.ini.j2 b/roles/lemonldap_ng/templates/lemonldap-ng.ini.j2 index 3fbb511..f1f481f 100644 --- a/roles/lemonldap_ng/templates/lemonldap-ng.ini.j2 +++ b/roles/lemonldap_ng/templates/lemonldap-ng.ini.j2 @@ -1,8 +1,9 @@ ; {{ ansible_managed }} [all] -logLevel = info +logLevel = notice logger = Lemonldap::NG::Common::Logger::Syslog +userLogger = Lemonldap::NG::Common::Logger::Syslog {% if llng_conf_backend == 'file' %} globalStorage = Apache::Session::File globalStorageOptions = { \ diff --git a/roles/seafile/tasks/main.yml b/roles/seafile/tasks/main.yml index 7fa9725..d34eb20 100644 --- a/roles/seafile/tasks/main.yml +++ b/roles/seafile/tasks/main.yml @@ -1,16 +1,28 @@ --- -- include: user.yml -- include: directories.yml -- include: facts.yml -- include: archive_pre.yml - when: seafile_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: iptables.yml -- include: services.yml -- include: archive_post.yml - when: seafile_install_mode == 'upgrade' -- include: write_version.yml -- include: cleanup.yml -- include: filebeat.yml +- include_tasks: user.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: archive_pre.yml + when: seafile_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: iptables.yml + tags: always +- include_tasks: services.yml + tags: always +- include_tasks: archive_post.yml + when: seafile_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: cleanup.yml + tags: always +- include_tasks: filebeat.yml + tags: always