diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-27 19:39:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 19:39:16 +0200 |
| commit | 0afd4e113a00394806b8d195cc8eba47928dbd31 (patch) | |
| tree | 2f20a2efd624de512d6fa350bf9a2a6a0cc514d7 | |
| parent | 536fd31f868a19ccbea72a637cb6b984fa368ce9 (diff) | |
| parent | e7c5072b28e9d021a36228b3828f38d6e8da0320 (diff) | |
| download | vyos-1x-0afd4e113a00394806b8d195cc8eba47928dbd31.tar.gz vyos-1x-0afd4e113a00394806b8d195cc8eba47928dbd31.zip | |
Merge pull request #382 from DmitriyEshenko/fix-pppoe-sesctrl
pppoe-server: T2391: Migrate single-session param to [common] section
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.tmpl | 8 | ||||
| -rwxr-xr-x | src/conf_mode/service_pppoe-server.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl index 99b3923b2..aece47a66 100644 --- a/data/templates/accel-ppp/pppoe.config.tmpl +++ b/data/templates/accel-ppp/pppoe.config.tmpl @@ -114,12 +114,14 @@ dae-server={{ radius_dynamic_author.server }}:{{ radius_dynamic_author.port }},{ {% endif -%} {% endif %} +{% if sesscrtl != 'disable' %} +[common] +single-session={{ sesscrtl }} +{% endif %} + [ppp] verbose=1 check-ip=1 -{% if not sesscrtl == 'disable' %} -single-session={{sesscrtl}} -{% endif -%} {% if ppp_ccp %} ccp=1 {% endif %} diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py index 36033b198..e05b0ab2a 100755 --- a/src/conf_mode/service_pppoe-server.py +++ b/src/conf_mode/service_pppoe-server.py @@ -315,7 +315,7 @@ def get_config(): pppoe['mtu'] = conf.return_value(['mtu']) if conf.exists(['session-control']): - pppoe['session_control'] = conf.return_value(['session-control']) + pppoe['sesscrtl'] = conf.return_value(['session-control']) # ppp_options if conf.exists(['ppp-options']): |