3 files changed, 33 insertions, 6 deletions
diff --git a/data/templates/accel-ppp/config_ip_pool.j2 b/data/templates/accel-ppp/config_ip_pool.j2
index 0bef4ad69..f7511e445 100644
--- a/data/templates/accel-ppp/config_ip_pool.j2
+++ b/data/templates/accel-ppp/config_ip_pool.j2
@@ -11,4 +11,14 @@ gw-ip-address={{ gateway_address }}
 {{ subnet }}
 {%         endfor %}
 {%     endif %}
-{% endif %}
+{%     if client_ip_pool.name is vyos_defined %}
+{%         for pool, pool_config in client_ip_pool.name.items() %}
+{%             if pool_config.subnet is vyos_defined %}
+{{ pool_config.subnet }},name={{ pool }}
+{%             endif %}
+{%             if pool_config.gateway_address is vyos_defined %}
+gw-ip-address={{ pool_config.gateway_address }}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+{% endif %}
+\ No newline at end of file
diff --git a/data/templates/accel-ppp/config_shaper_radius.j2 b/data/templates/accel-ppp/config_shaper_radius.j2
index 942cdf132..0cf6a6a92 100644
--- a/data/templates/accel-ppp/config_shaper_radius.j2
+++ b/data/templates/accel-ppp/config_shaper_radius.j2
@@ -1,7 +1,7 @@
-{% if authentication.mode is vyos_defined('radius') %}
-{%     if authentication.radius.rate_limit.enable is vyos_defined %}
+{% if authentication.mode is vyos_defined('radius') or shaper is vyos_defined %}
 [shaper]
 verbose=1
+{%     if authentication.radius.rate_limit.enable is vyos_defined %}
 attr={{ authentication.radius.rate_limit.attribute }}
 {%         if authentication.radius.rate_limit.vendor is vyos_defined %}
 vendor={{ authentication.radius.rate_limit.vendor }}
@@ -10,4 +10,10 @@ vendor={{ authentication.radius.rate_limit.vendor }}
 rate-multiplier={{ authentication.radius.rate_limit.multiplier }}
 {%         endif %}
 {%     endif %}
-{% endif %}
+{%     if shaper is vyos_defined %}
+{%         if shaper.fwmark is vyos_defined %}
+fwmark={{ shaper.fwmark }}
+down-limiter=htb
+{%         endif %}
+{%     endif %}
+{% endif %}
+\ No newline at end of file
diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2
index f4129d3e2..811c4ccc0 100644
--- a/data/templates/accel-ppp/pppoe.config.j2
+++ b/data/templates/accel-ppp/pppoe.config.j2
@@ -69,8 +69,6 @@ ccp={{ "1" if ppp_options.ccp is vyos_defined else "0" }}
 unit-preallocate={{ "1" if authentication.radius.preallocate_vif is vyos_defined else "0" }}
 {% if ppp_options.min_mtu is vyos_defined %}
 min-mtu={{ ppp_options.min_mtu }}
-{% else %}
-min-mtu={{ mtu }}
 {% endif %}
 {% if ppp_options.mru is vyos_defined %}
 mru={{ ppp_options.mru }}
@@ -135,6 +133,19 @@ pado-delay={{ pado_delay_param.value }}
 called-sid={{ authentication.radius.called_sid_format }}
 {% endif %}
 
+{% if authentication.mode is vyos_defined("local") %}
+{%     if client_ip_pool.name is vyos_defined %}
+{%         for pool, pool_config in client_ip_pool.name.items() %}
+{%             if pool_config.subnet is vyos_defined %}
+ip-pool={{ pool }}
+{%             endif %}
+{%             if pool_config.gateway_address is vyos_defined %}
+gw-ip-address={{ pool_config.gateway_address }}/{{ pool_config.subnet.split('/')[1] }}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+{% endif %}
+
 {% if limits is vyos_defined %}
 [connlimit]
 {%     if limits.connection_limit is vyos_defined %}