From 5acb1956f5a088b5ac371c70ed989050f8e5e0ab Mon Sep 17 00:00:00 2001 From: William Hirigoyen Date: Wed, 27 Mar 2024 15:17:48 +0100 Subject: [PATCH] packweb: fix old bug (2017!) .orig file created by module patch and taken in account by ProFTPd --- CHANGELOG.md | 1 + webapps/evoadmin-web/tasks/ftp.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be066a67..82b4e7fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ The **patch** part is incremented if multiple releases happen the same month * memcached: Fix conditions not properly writen (installation was always in multi-instance mode) * fail2ban: SQLite purge script didn't vacuum as expected + error when vacuum cannot be done * nagios-nrpe: create /etc/bash_completion.d if missing +* packweb: fix old bug (2017!) .orig file created by module patch and taken in account by ProFTPd ### Removed diff --git a/webapps/evoadmin-web/tasks/ftp.yml b/webapps/evoadmin-web/tasks/ftp.yml index 8c400e68..614ac4f0 100644 --- a/webapps/evoadmin-web/tasks/ftp.yml +++ b/webapps/evoadmin-web/tasks/ftp.yml @@ -10,3 +10,9 @@ remote_src: False src: ftp/evolinux.conf.diff dest: /etc/proftpd/conf.d/z-evolinux.conf + +- name: Remove .orig file created by previous patch task + ansible.builtin.file: + path: /etc/proftpd/conf.d/z-evolinux.conf.orig + state: absent +