From 957a542fb0446668f264f898628f687ca0fc1cd6 Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <dmitriy.eshenko@vyos.io>
Date: Tue, 9 Jun 2020 19:37:45 +0000
Subject: sstp: T2575: Add missing gw-ip-address

---
 data/templates/accel-ppp/sstp.config.tmpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'data/templates')

diff --git a/data/templates/accel-ppp/sstp.config.tmpl b/data/templates/accel-ppp/sstp.config.tmpl
index 411fca489..2c8c00023 100644
--- a/data/templates/accel-ppp/sstp.config.tmpl
+++ b/data/templates/accel-ppp/sstp.config.tmpl
@@ -91,6 +91,9 @@ bind={{ radius_source_address }}
 dae-server={{ radius_dynamic_author.server }}:{{ radius_dynamic_author.port }},{{ radius_dynamic_author.key }}
 {% endif -%}
 {% endif %}
+{% if client_gateway %}
+gw-ip-address={{ client_gateway }}
+{% endif %}
 
 [ppp]
 verbose=1
-- 
cgit v1.2.3


From 0a31cc181878b92db6de552ed68fd02fd5b4e905 Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <dmitriy.eshenko@vyos.io>
Date: Tue, 9 Jun 2020 19:49:17 +0000
Subject: pppoe-server: T2575: Add missing gw-ip-address

---
 data/templates/accel-ppp/pppoe.config.tmpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'data/templates')

diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl
index aa9254e61..6c4ff89b1 100644
--- a/data/templates/accel-ppp/pppoe.config.tmpl
+++ b/data/templates/accel-ppp/pppoe.config.tmpl
@@ -88,7 +88,6 @@ wins{{ loop.index }}={{ server }}
 
 {% if auth_mode == 'local' %}
 [chap-secrets]
-gw-ip-address={{ ppp_gw }}
 chap-secrets={{ chap_secrets_file }}
 {% elif auth_mode == 'radius' %}
 [radius]
@@ -116,6 +115,9 @@ bind={{ radius_source_address }}
 dae-server={{ radius_dynamic_author.server }}:{{ radius_dynamic_author.port }},{{ radius_dynamic_author.key }}
 {% endif -%}
 {% endif %}
+{% if ppp_gw %}
+gw-ip-address={{ ppp_gw }}
+{% endif %}
 
 {% if sesscrtl != 'disable' %}
 [common]
-- 
cgit v1.2.3