From 20191c8873711d548727c6116a356c427e1ae0a4 Mon Sep 17 00:00:00 2001 From: Patrick Marchand Date: Tue, 24 Dec 2019 14:10:24 -0500 Subject: [PATCH] Fixed regression introduced by commit 276177900bd321e52f3049542254fdb9b99b1e0c The default behavior for ansible template is to overwrite the targeted file. Since we dont always want to overwrite a file when we play this role, we set `force` to `False` by default. This means that if the `dest` already exists, ansible will not overwrite it with it's given template. This is fine for most of the tasks in this role, but in the case of `{{ evoadmin_scripts_dir }}/web-mail.tpl`,the file is created by a task that runs prior to the template task, so setting it to `False` by default means it never gets updated and clients dont get notified when they create new websites. --- CHANGELOG.md | 1 + webapps/evoadmin-web/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5537c63..1a1d7338 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ The **patch** part changes incrementally at each release. * evolinux-base: Fix our zsyslog rotate config that doesn't work on Debian 10 * certbot: Properly evaluate when apache is installed * evolinux-base: Don't make alert5.service executable as systemd will complain +* webapps/evoadmin-web: Set default evoadmin_mail_tpl_force to True to fix a regression where the mail template would not get updated because the file is created before the role is first run. ### Security diff --git a/webapps/evoadmin-web/defaults/main.yml b/webapps/evoadmin-web/defaults/main.yml index af341a53..2d174718 100644 --- a/webapps/evoadmin-web/defaults/main.yml +++ b/webapps/evoadmin-web/defaults/main.yml @@ -17,7 +17,7 @@ evoadmin_force_vhost: False evoadmin_config_local_php_force: False evoadmin_sudoers_conf_force: False evoadmin_add_conf_force: False -evoadmin_mail_tpl_force: False +evoadmin_mail_tpl_force: True evoadmin_htpasswd_force: False evoadmin_htpasswd: False