diff options
| author | Jamie Austin <jamiea@opusv.com.au> | 2023-04-20 17:07:53 +1000 |
|---|---|---|
| committer | Jamie Austin <jamiea@opusv.com.au> | 2023-04-20 17:10:27 +1000 |
| commit | 93de3abe1368cab5ab8cd292689466d7af8e86bc (patch) | |
| tree | 026f9fadcbea105db2d0ba90d4d4db40c2b35d32 /data/templates/ocserv | |
| parent | 80d83f6392ceac3907a9c23c6525c984e5808b4d (diff) | |
| download | vyos-1x-93de3abe1368cab5ab8cd292689466d7af8e86bc.tar.gz vyos-1x-93de3abe1368cab5ab8cd292689466d7af8e86bc.zip | |
ocserv: T3896: refactor: change ocserv config-per-x node name
Changes the node name from config-per-x to identity-based-config, as a result the j2 templates and vpn_openeconnect.py has been refactored to update the node name when accessing it's child nodes.
Diffstat (limited to 'data/templates/ocserv')
| -rw-r--r-- | data/templates/ocserv/ocserv_config.j2 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/templates/ocserv/ocserv_config.j2 b/data/templates/ocserv/ocserv_config.j2 index ea2c9e29f..52c208c0d 100644 --- a/data/templates/ocserv/ocserv_config.j2 +++ b/data/templates/ocserv/ocserv_config.j2 @@ -12,11 +12,11 @@ run-as-group = daemon {% if "radius" in authentication.mode %} auth = "radius [config=/run/ocserv/radiusclient.conf{{ ',groupconfig=true' if authentication.radius.groupconfig is vyos_defined else '' }}]" -{% if "config_per_x" in authentication %} -{% if authentication.config_per_x.disabled is not vyos_defined %} -{% if "group" in authentication.config_per_x.mode %} -config-per-group = {{ authentication.config_per_x.directory }} -default-group-config = {{ authentication.config_per_x.default_config }} +{% if "identity_based_config" in authentication %} +{% if authentication.identity_based_config.disabled is not vyos_defined %} +{% if "group" in authentication.identity_based_config.mode %} +config-per-group = {{ authentication.identity_based_config.directory }} +default-group-config = {{ authentication.identity_based_config.default_config }} {% endif %} {% endif %} {% endif %} @@ -32,10 +32,10 @@ auth = "plain[/run/ocserv/ocpasswd]" auth = "plain[/run/ocserv/ocpasswd]" {% endif %} -{% if "config_per_x" in authentication %} -{% if "user" in authentication.config_per_x.mode %} -config-per-user = {{ authentication.config_per_x.directory }} -default-user-config = {{ authentication.config_per_x.default_config }} +{% if "identity_based_config" in authentication %} +{% if "user" in authentication.identity_based_config.mode %} +config-per-user = {{ authentication.identity_based_config.directory }} +default-user-config = {{ authentication.identity_based_config.default_config }} {% endif %} {% endif %} |