From f4e9248d2a24fc4fd0cdc7089aed0193d7a2884f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 4 Oct 2020 12:11:23 +0200 Subject: pppoe-server: T2953: rename CLI local-ip to gateway-address Required to get a common CLI for all services provided by Accel-PPP. Once the CLI for each service is consitent - Jinja2 templates can be reused together with get_config_dict(). --- data/templates/accel-ppp/config_ip_pool.j2 | 6 +++--- data/templates/accel-ppp/pppoe.config.tmpl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/templates') diff --git a/data/templates/accel-ppp/config_ip_pool.j2 b/data/templates/accel-ppp/config_ip_pool.j2 index 51fe67334..973bc0071 100644 --- a/data/templates/accel-ppp/config_ip_pool.j2 +++ b/data/templates/accel-ppp/config_ip_pool.j2 @@ -1,11 +1,11 @@ {% if client_ip_pool is defined and client_ip_pool is not none %} [ip-pool] -{% if local_ip is defined and local_ip is not none %} -gw-ip-address={{ local_ip }} +{% if gateway_address is defined and gateway_address is not none %} +gw-ip-address={{ gateway_address }} {% endif %} {% if client_ip_pool.start is defined and client_ip_pool.stop is defined and client_ip_pool.start is not none and client_ip_pool.stop is not none %} {{ client_ip_pool.start }}-{{ client_ip_pool.stop }} -{% endif -%} +{% endif %} {% if client_ip_pool.subnet is defined and client_ip_pool.subnet is not none %} {% for subnet in client_ip_pool.subnet %} {{ subnet }} diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl index acc7df0a2..8f1b9e7c5 100644 --- a/data/templates/accel-ppp/pppoe.config.tmpl +++ b/data/templates/accel-ppp/pppoe.config.tmpl @@ -92,8 +92,8 @@ dae-server={{ authentication.radius.dynamic_author.server }}:{{ authentication.r {% endif -%} {% endif %} -{% if local_ip is defined and local_ip is not none %} -gw-ip-address={{ local_ip }} +{% if gateway_address is defined and gateway_address is not none %} +gw-ip-address={{ gateway_address }} {% endif %} {% if session_control is defined and session_control != 'disable' %} -- cgit v1.2.3