diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-10 07:56:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 07:56:56 +0200 |
| commit | bc5cec0fbb9f8828b4928eb047ffdee38306269c (patch) | |
| tree | e639d53fb2adeea10f02a3cba44343533f6fc80f | |
| parent | dc7654cbc6cd18bd202a3fa52c2afef3fbc11b45 (diff) | |
| parent | 0a31cc181878b92db6de552ed68fd02fd5b4e905 (diff) | |
| download | vyos-1x-bc5cec0fbb9f8828b4928eb047ffdee38306269c.tar.gz vyos-1x-bc5cec0fbb9f8828b4928eb047ffdee38306269c.zip | |
Merge pull request #448 from DmitriyEshenko/1xppp09062020
1xppp09062020
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.tmpl | 4 | ||||
| -rw-r--r-- | data/templates/accel-ppp/sstp.config.tmpl | 3 |
2 files changed, 6 insertions, 1 deletions
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] 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 |