From 051d81caef5eea3fa63e1cffe87e39248630352d Mon Sep 17 00:00:00 2001
From: Tommaso Piccioli <tommaso.piccioli@isti.cnr.it>
Date: Wed, 20 Oct 2021 16:01:09 +0200
Subject: [PATCH] Update 'templates/vsftpd.conf.j2'

---
 templates/vsftpd.conf.j2 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/templates/vsftpd.conf.j2 b/templates/vsftpd.conf.j2
index b588970..ba42089 100644
--- a/templates/vsftpd.conf.j2
+++ b/templates/vsftpd.conf.j2
@@ -117,6 +117,14 @@ secure_chroot_dir=/var/run/vsftpd/empty
 # This string is the name of the PAM service vsftpd will use.
 pam_service_name=vsftpd
 #
+{% if vsftpd_force_tls %}
+  {% set value_force_local_logins_ssl = 'YES' %}
+  {% set value_force_local_data_ssl = 'YES' %}
+{% else %}
+  {% set value_force_local_logins_ssl = 'NO' %}
+  {% set value_force_local_data_ssl = 'NO' %}
+{% endif %}
+#
 {% if vsftpd_tls_enabled %}
 # SSL/TLS
 ssl_enable=YES
@@ -136,16 +144,9 @@ ssl_tlsv1=YES
 ca_certs_file={{ vsftpd_ssl_ca_certificate }}
 rsa_cert_file={{ vsftpd_ssl_certificate }}
 rsa_private_key_file={{ vsftpd_ssl_certificate_key }}
-{% if vsftpd_force_tls %}
-force_local_logins_ssl=YES
-force_local_data_ssl=YES
-{% else %}
-force_local_logins_ssl=NO
-force_local_data_ssl=NO
-{% endif %}
+force_local_logins_ssl={{ value_force_local_logins_ssl }}
+force_local_data_ssl={{ value_force_local_data_ssl }}
 require_ssl_reuse={{ vsftpd_require_ssl_reuse }}
-{% endif %}
-{% else %}
 # This option specifies the location of the RSA certificate to use for SSL
 # encrypted connections.
 rsa_cert_file=/etc/ssl/private/vsftpd.pem