diff options
| author | DmitriyEshenko <dmitriy.eshenko@vyos.io> | 2020-04-27 14:32:53 +0000 |
|---|---|---|
| committer | DmitriyEshenko <dmitriy.eshenko@vyos.io> | 2020-04-27 14:32:53 +0000 |
| commit | e7c5072b28e9d021a36228b3828f38d6e8da0320 (patch) | |
| tree | 6db7b7ac58155852b7a63aa7f5fae92fa80a3ecb | |
| parent | 69977520cd74cc3af4594039e26dc0d5b49c9b35 (diff) | |
| download | vyos-1x-e7c5072b28e9d021a36228b3828f38d6e8da0320.tar.gz vyos-1x-e7c5072b28e9d021a36228b3828f38d6e8da0320.zip | |
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 64890c992..518c7633a 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']): |