diff options
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/accel_pppoe.py | 6 | ||||
| -rwxr-xr-x | src/conf_mode/ntp.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py index 97e3723f0..a113ed34e 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 @@ -61,9 +64,6 @@ net-snmp {% if limits %} connlimit {% endif %} -{% if authentication['mode'] == 'radius' %} -radius -{% endif %} [core] thread-count={{thread_cnt}} diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py index 65bd388bf..68a046939 100755 --- a/src/conf_mode/ntp.py +++ b/src/conf_mode/ntp.py @@ -41,8 +41,7 @@ restrict default noquery nopeer notrap nomodify restrict 127.0.0.1 restrict -6 ::1 -# Do not listen on any interface address by default -interface ignore wildcard + # # Configurable section # @@ -65,6 +64,7 @@ restrict {{ n.address }} mask {{ n.netmask }} nomodify notrap nopeer {% if listen_address -%} # NTP should listen on configured addresses only +interface ignore wildcard {% for a in listen_address -%} interface listen {{ a }} {% endfor -%} |