From cd46dd8320fb50d61781748bf786c285d059050b Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 13 Sep 2022 16:31:03 +0200 Subject: [PATCH] proftpd: Add a warning if config file was overriden --- CHANGELOG.md | 2 +- proftpd/templates/evolinux.conf.j2 | 4 ++++ proftpd/templates/ftps.conf.j2 | 4 ++++ proftpd/templates/sftp.conf.j2 | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dce6bf3a..be884139 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * webapps/nextcloud: Add compatibility with apache2, and apache2 mod_php. * inspect-domains: Add role * memcached: NRPE check for multi-instance setup -* proftpd: Add options to override configs +* proftpd: Add options to override configs (and add a warning if file was overriden) * proftpd: Allow user auth with ssh keys ### Changed diff --git a/proftpd/templates/evolinux.conf.j2 b/proftpd/templates/evolinux.conf.j2 index 08484714..8ad06927 100644 --- a/proftpd/templates/evolinux.conf.j2 +++ b/proftpd/templates/evolinux.conf.j2 @@ -1,5 +1,9 @@ # Evolix's specific configuration +{% if proftpd_ftp_override %} +# WARNING : **Probably** ansible managed +{% endif %} + LoadModule mod_ident.c diff --git a/proftpd/templates/ftps.conf.j2 b/proftpd/templates/ftps.conf.j2 index 2db74b37..f9826989 100644 --- a/proftpd/templates/ftps.conf.j2 +++ b/proftpd/templates/ftps.conf.j2 @@ -1,3 +1,7 @@ +{% if proftpd_ftps_override %} +# WARNING : **Probably** ansible managed +{% endif %} + LoadModule mod_tls.c diff --git a/proftpd/templates/sftp.conf.j2 b/proftpd/templates/sftp.conf.j2 index f54746f8..457f638b 100644 --- a/proftpd/templates/sftp.conf.j2 +++ b/proftpd/templates/sftp.conf.j2 @@ -1,3 +1,7 @@ +{% if proftpd_sftp_override %} +# WARNING : **Probably** ansible managed +{% endif %} + LoadModule mod_tls.c