diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:54:46 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:54:46 +0100 |
| commit | 24b23d41146eddd8fb0609ad4ae85d27e7c6ec6a (patch) | |
| tree | e703aab15145f877f23c6dde064f86de5585e96f /src/conf_mode/accel_pppoe.py | |
| parent | d3b689ecb951c49dddf0402f36f51a2e0d8216b3 (diff) | |
| parent | 9ab56f29f07a3c94a92bb7e1ffa54fcb4762a8fb (diff) | |
| download | vyos-1x-24b23d41146eddd8fb0609ad4ae85d27e7c6ec6a.tar.gz vyos-1x-24b23d41146eddd8fb0609ad4ae85d27e7c6ec6a.zip | |
Merge branch 'current' into equuleus
* current:
wireless: T1627: support station mode
wireless: T1627: support DHCP(v6) addresses
wireless: T1627: add support for RADIUS source-address
wireless: T1627: RADIUS servers must have a key specified
wireless: T1627: change RADIUS CLI syntax
l2tp: harmonize RADIUS wording
wireless: T1627: re-order WPA key in hostapd config
wireless: T1627: change priority from 318 to 400
wireless: T1627: fix generated ht_capab and vht_capab
wireless: T1627: fix regex for 'ht channel-set-width'
wireless: T1627: config migrator does not support camel casing
wireless: T1627: initial rewrite of show-wireless.pl in Python
wireless: T1627: add op-mode commands
wireless: T1627: initial rewrite in XML/Python style
pppoe-server: T1821: Set radius module priority
T1818: Print name of migration script on failure
T1814: Add log of migration scripts run during config migration
vyos-hostsd: T1812: run increment first
[vyos-hostsd] T1812: Reload pdns on dhcp client update
migration-scripts: l2tp: T1811: add missing check on server existence
Diffstat (limited to 'src/conf_mode/accel_pppoe.py')
| -rwxr-xr-x | src/conf_mode/accel_pppoe.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py index 9c879502a..6aec9be98 100755 --- a/src/conf_mode/accel_pppoe.py +++ b/src/conf_mode/accel_pppoe.py @@ -44,6 +44,9 @@ pppoe_config = ''' [modules] log_syslog pppoe +{% if authentication['mode'] == 'radius' %} +radius +{% endif %} ippool {% if client_ipv6_pool %} ipv6pool @@ -63,9 +66,6 @@ net-snmp {% if limits %} connlimit {% endif %} -{% if authentication['mode'] == 'radius' %} -radius -{% endif %} [core] thread-count={{thread_cnt}} |