3 files changed, 20 insertions, 4 deletions
diff --git a/data/templates/accel-ppp/ipoe.config.j2 b/data/templates/accel-ppp/ipoe.config.j2
index 3c0d47b27..6df12db2c 100644
--- a/data/templates/accel-ppp/ipoe.config.j2
+++ b/data/templates/accel-ppp/ipoe.config.j2
@@ -128,10 +128,16 @@ bind={{ radius_source_address }}
 {%     if radius_dynamic_author %}
 dae-server={{ radius_dynamic_author.server }}:{{ radius_dynamic_author.port }},{{ radius_dynamic_author.key }}
 {%     endif %}
-{%     if radius_shaper_attr %}
+
+{%     if radius_shaper_enable %}
 [shaper]
 verbose=1
+{%         if radius_shaper_attr %}
 attr={{ radius_shaper_attr }}
+{%         endif %}
+{%         if radius_shaper_multiplier %}
+rate-multiplier={{ radius_shaper_multiplier }}
+{%         endif %}
 {%         if radius_shaper_vendor %}
 vendor={{ radius_shaper_vendor }}
 {%         endif %}
diff --git a/data/templates/ntp/ntpd.conf.j2 b/data/templates/ntp/ntpd.conf.j2
index da610051e..8921826fa 100644
--- a/data/templates/ntp/ntpd.conf.j2
+++ b/data/templates/ntp/ntpd.conf.j2
@@ -33,10 +33,17 @@ restrict {{ address | address_from_cidr }} mask {{ address | netmask_from_cidr }
 {%     endfor %}
 {% endif %}
 
-{% if listen_address %}
+{% if listen_address is vyos_defined or interface is vyos_defined %}
 # NTP should listen on configured addresses only
 interface ignore wildcard
-{%     for address in listen_address %}
+{%     if listen_address is vyos_defined %}
+{%         for address in listen_address %}
 interface listen {{ address }}
-{%     endfor %}
+{%         endfor %}
+{%     endif %}
+{%     if interface is vyos_defined %}
+{%         for ifname in interface %}
+interface listen {{ ifname }}
+{%         endfor %}
+{%     endif %}
 {% endif %}
diff --git a/data/templates/router-advert/radvd.conf.j2 b/data/templates/router-advert/radvd.conf.j2
index 6902dc05a..ed15b32f0 100644
--- a/data/templates/router-advert/radvd.conf.j2
+++ b/data/templates/router-advert/radvd.conf.j2
@@ -55,6 +55,9 @@ interface {{ iface }} {
 {%         endif %}
 {%         if iface_config.name_server is vyos_defined %}
     RDNSS {{ iface_config.name_server | join(" ") }} {
+{%             if iface_config.name_server_lifetime is vyos_defined %}
+        AdvRDNSSLifetime {{ iface_config.name_server_lifetime }};
+{%             endif %}
     };
 {%         endif %}
 {%         if iface_config.dnssl is vyos_defined %}