diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-29 21:20:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 21:20:04 +0100 |
| commit | 5b6b865b71415a1be9d5a758dfbccb81906f2f2a (patch) | |
| tree | 4d276d630b055b1c83b5dcaf527def2bff71ec3b | |
| parent | d5e4561955b70c2e1f42aa988c6be86f2913c6bd (diff) | |
| parent | 5f9dea92362a46b65d0164882035d9dcff86a973 (diff) | |
| download | vyos-1x-5b6b865b71415a1be9d5a758dfbccb81906f2f2a.tar.gz vyos-1x-5b6b865b71415a1be9d5a758dfbccb81906f2f2a.zip | |
Merge pull request #661 from DmitriyEshenko/1x-pppoe-29122020
pppoe-server: T3160: Move called-sid param to required section
| -rw-r--r-- | data/templates/accel-ppp/config_chap_secrets_radius.j2 | 3 | ||||
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.tmpl | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/accel-ppp/config_chap_secrets_radius.j2 b/data/templates/accel-ppp/config_chap_secrets_radius.j2 index 52d5d40e7..4e2254b21 100644 --- a/data/templates/accel-ppp/config_chap_secrets_radius.j2 +++ b/data/templates/accel-ppp/config_chap_secrets_radius.j2 @@ -22,9 +22,6 @@ nas-ip-address={{ authentication.radius.nas_ip_address }} {% if authentication.radius.source_address is defined and authentication.radius.source_address is not none %}
bind={{ authentication.radius.source_address }}
{% endif %}
-{% if authentication.radius.called_sid_format is defined and authentication.radius.called_sid_format is not none %}
-called-sid={{ authentication.radius.called_sid_format }}
-{% endif %}
{% if authentication.radius.dynamic_author.server is defined and authentication.radius.dynamic_author.server is not none %}
dae-server={{ authentication.radius.dynamic_author.server }}:{{ authentication.radius.dynamic_author.port }},{{ authentication.radius.dynamic_author.key }}
{% endif %}
diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl index 1d6c1fefc..b39c4452d 100644 --- a/data/templates/accel-ppp/pppoe.config.tmpl +++ b/data/templates/accel-ppp/pppoe.config.tmpl @@ -126,6 +126,9 @@ burst={{ limits.burst }} timeout={{ limits.timeout }} {% endif %} {% endif %} +{% if authentication.radius.called_sid_format is defined and authentication.radius.called_sid_format is not none %} +called-sid={{ authentication.radius.called_sid_format }} +{% endif %} {# Common RADIUS shaper configuration #} {% include 'accel-ppp/config_shaper_radius.j2' %} |