diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-09-01 21:54:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-01 21:54:00 +0200 |
commit | 022c5e810b8fd62b193e6eee62bfe344e294b25e (patch) | |
tree | 16380a6c322cceb43171d43d52ef6a0275c95aa0 | |
parent | 38e02c12a50de685c6d70954cd94a224e8083f0b (diff) | |
parent | 23388fe193f04ab05f270098123cbb3e5f0b9f75 (diff) | |
download | vyos-1x-022c5e810b8fd62b193e6eee62bfe344e294b25e.tar.gz vyos-1x-022c5e810b8fd62b193e6eee62bfe344e294b25e.zip |
Merge pull request #987 from DmitriyEshenko/fix01092021-01
pptp-server: T3790: Change ippool priority and define gw-ip-address
-rw-r--r-- | data/templates/accel-ppp/pptp.config.tmpl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/data/templates/accel-ppp/pptp.config.tmpl b/data/templates/accel-ppp/pptp.config.tmpl index 5a6cfe749..3cfc4a906 100644 --- a/data/templates/accel-ppp/pptp.config.tmpl +++ b/data/templates/accel-ppp/pptp.config.tmpl @@ -2,12 +2,13 @@ [modules] log_syslog pptp -ippool +shaper {% if auth_mode == 'local' %} chap-secrets {% elif auth_mode == 'radius' %} radius {% endif %} +ippool {% for proto in auth_proto %} {{proto}} {% endfor %} @@ -87,6 +88,10 @@ nas-ip-address={{ radius_nas_ip }} bind={{ radius_source_address }} {% endif %} {% endif %} +{# Both chap-secrets and radius block required the gw-ip-address #} +{% if gw_ip is defined and gw_ip is not none %} +gw-ip-address={{ gw_ip }} +{% endif %} [cli] tcp=127.0.0.1:2003 |