summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorDmitriyEshenko <dmitriy.eshenko@vyos.io>2020-12-29 18:29:42 +0000
committerDmitriyEshenko <dmitriy.eshenko@vyos.io>2020-12-29 18:29:42 +0000
commit5f9dea92362a46b65d0164882035d9dcff86a973 (patch)
treea187993b6e0ebc36696e3ea61f20a72aa701c852 /data/templates
parent34426d045048e3ee3067301b0f8eed402e3d625c (diff)
downloadvyos-1x-5f9dea92362a46b65d0164882035d9dcff86a973.tar.gz
vyos-1x-5f9dea92362a46b65d0164882035d9dcff86a973.zip
pppoe-server: T3160: Move called-sid param to required section
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/accel-ppp/config_chap_secrets_radius.j23
-rw-r--r--data/templates/accel-ppp/pppoe.config.tmpl3
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' %}