From 2999d5ae8d83d6bd7f530575856d4656ac69a042 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Tue, 23 Jun 2020 13:58:05 +0200
Subject: [PATCH] Add username-as-common-name if the certificate authentication
 is not enabled.

---
 templates/server.conf.j2 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/server.conf.j2 b/templates/server.conf.j2
index bf53572..b43758f 100644
--- a/templates/server.conf.j2
+++ b/templates/server.conf.j2
@@ -40,9 +40,7 @@ compress lz4-v2
 push "compress lz4-v2"
 {% endif %}
 keepalive {{ openvpn_keepalive }}
-{% if openvpn_cert_auth_enabled %}
 tls-server
-{% endif %}
 tls-auth {{ openvpn_tls_auth }} 0
 key-direction 0
 dh {{ openvpn_dh }}
@@ -52,6 +50,7 @@ key {{ openvpn_key }}
 {% if not openvpn_cert_auth_enabled %}
 # Disable cert-auth
 client-cert-not-required
+username-as-common-name
 {% endif %}
 {% if openvpn_username_pam_auth %}
 username-as-common-name