summaryrefslogtreecommitdiff
path: root/data/templates/ipsec/charon
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-07-19 19:01:43 +0200
committerChristian Poessinger <christian@poessinger.com>2021-07-19 19:01:43 +0200
commit9556d78b1d54c7320a0154990c61d23c6197c38f (patch)
treeb04a677d46bc5e4055b96452f73ca44de392cb2f /data/templates/ipsec/charon
parent48c768abbf53b752a55db2adea1f998cb28da55c (diff)
downloadvyos-1x-9556d78b1d54c7320a0154990c61d23c6197c38f.tar.gz
vyos-1x-9556d78b1d54c7320a0154990c61d23c6197c38f.zip
ipsec: T1210: split out pool from remote-access configuration
Remote access IP pools can now be defined at a global level and referenced in IPSec remote-access connections. To defined a pool use: set vpn ipsec remote-access pool global-ipv4 name-server '172.16.1.1' set vpn ipsec remote-access pool global-ipv4 prefix '192.168.0.0/24' set vpn ipsec remote-access pool global-ipv6 name-server '2001:db8::1' set vpn ipsec remote-access pool global-ipv6 prefix '2001:db8:1000::/64' A connection can then reference the pool: set vpn ipsec remote-access connection foo pool 'global-ipv4' set vpn ipsec remote-access connection foo pool 'global-ipv6'
Diffstat (limited to 'data/templates/ipsec/charon')
-rw-r--r--data/templates/ipsec/charon/dhcp.conf.tmpl11
1 files changed, 5 insertions, 6 deletions
diff --git a/data/templates/ipsec/charon/dhcp.conf.tmpl b/data/templates/ipsec/charon/dhcp.conf.tmpl
index 2879550a8..96dfd7633 100644
--- a/data/templates/ipsec/charon/dhcp.conf.tmpl
+++ b/data/templates/ipsec/charon/dhcp.conf.tmpl
@@ -1,12 +1,11 @@
dhcp {
load = yes
-
-{% if options is defined and options.remote_access is defined and options.remote_access.dhcp_pool is defined %}
-{% if options.remote_access.dhcp_pool.interface is defined %}
- interface = {{ options.remote_access.dhcp_pool.interface }}
+{% if options is defined and options.remote_access is defined and options.remote_access.dhcp is defined %}
+{% if options.remote_access.dhcp.interface is defined %}
+ interface = {{ options.remote_access.dhcp.interface }}
{% endif %}
-{% if options.remote_access.dhcp_pool.server is defined %}
- server = {{ options.remote_access.dhcp_pool.server }}
+{% if options.remote_access.dhcp.server is defined %}
+ server = {{ options.remote_access.dhcp.server }}
{% endif %}
{% endif %}