summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDmitriyEshenko <dmitriy.eshenko@vyos.io>2021-09-01 18:53:08 +0000
committerChristian Poessinger <christian@poessinger.com>2021-09-02 13:32:35 +0200
commit0d1bb97861bc904ba6699b9d031f64adb33d044a (patch)
tree857cf540a88c55fea37010c6c35587ae5eee79ff /data
parent31b3a925d3bc2cc9626ad8d751825f5301cd8c2f (diff)
downloadvyos-1x-0d1bb97861bc904ba6699b9d031f64adb33d044a.tar.gz
vyos-1x-0d1bb97861bc904ba6699b9d031f64adb33d044a.zip
pptp-server: T3790: Change ippool priority and define gw-ip-address
(cherry picked from commit 23388fe193f04ab05f270098123cbb3e5f0b9f75)
Diffstat (limited to 'data')
-rw-r--r--data/templates/accel-ppp/pptp.config.tmpl7
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