From fc36d67b051bad776a5b1d6e9a04f1205487f01f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 13 Apr 2022 22:51:33 +0200
Subject: ocserv: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/ocserv/ocserv_config.tmpl  |  6 +++---
 data/templates/ocserv/ocserv_otp_usr.tmpl |  4 ++--
 data/templates/ocserv/ocserv_passwd.tmpl  | 12 +++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/data/templates/ocserv/ocserv_config.tmpl b/data/templates/ocserv/ocserv_config.tmpl
index 19045c4b4..05b85a610 100644
--- a/data/templates/ocserv/ocserv_config.tmpl
+++ b/data/templates/ocserv/ocserv_config.tmpl
@@ -20,15 +20,15 @@ auth = "plain[/run/ocserv/ocpasswd]"
 auth = "plain[/run/ocserv/ocpasswd]"
 {% endif %}
 
-{% if ssl.certificate is defined %}
+{% if ssl.certificate is vyos_defined %}
 server-cert = /run/ocserv/cert.pem
 server-key = /run/ocserv/cert.key
-{% if ssl.passphrase is defined %}
+{% if ssl.passphrase is vyos_defined %}
 key-pin = {{ ssl.passphrase }}
 {% endif %}
 {% endif %}
 
-{% if ssl.ca_certificate is defined %}
+{% if ssl.ca_certificate is vyos_defined %}
 ca-cert = /run/ocserv/ca.pem
 {% endif %}
 
diff --git a/data/templates/ocserv/ocserv_otp_usr.tmpl b/data/templates/ocserv/ocserv_otp_usr.tmpl
index fea9af5d5..18de5fec6 100644
--- a/data/templates/ocserv/ocserv_otp_usr.tmpl
+++ b/data/templates/ocserv/ocserv_otp_usr.tmpl
@@ -1,7 +1,7 @@
 #<token_type> <username> <pin> <secret_hex_key> <counter> <lastpass> <time>
-{% if username is defined %}
+{% if username is vyos_defined %}
 {%   for user, user_config in username.items() %}
-{%     if user_config.disable is not defined and user_config.otp is defined and user_config.otp is not none %}
+{%     if user_config.disable is not vyos_defined and user_config.otp is vyos_defined %}
 {{ user_config.otp.token_tmpl }} {{ user }} {{ user_config.otp.pin | default("-", true) }} {{ user_config.otp.key }}
 {%     endif %}
 {%   endfor %}
diff --git a/data/templates/ocserv/ocserv_passwd.tmpl b/data/templates/ocserv/ocserv_passwd.tmpl
index ffadb4860..30c79d66a 100644
--- a/data/templates/ocserv/ocserv_passwd.tmpl
+++ b/data/templates/ocserv/ocserv_passwd.tmpl
@@ -1,6 +1,8 @@
 #<username>:<group>:<hash>
-{% for user in username if username is defined %}
-{%   if not "disable" in username[user] %}
-{{ user }}:*:{{ username[user].hash }}
-{%   endif %}
-{% endfor %}
\ No newline at end of file
+{% if username is vyos_defined %}
+{%     for user, user_config in username.items() %}
+{%         if user_config.disable is not vyos_defined %}
+{{ user }}:*:{{ user_config.hash }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
\ No newline at end of file
-- 
cgit v1.2.3