diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-18 12:38:47 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-18 14:31:51 +0200 |
| commit | 267b3213ef0e6ac4501470bef797796276879421 (patch) | |
| tree | 7d2ede2263d72ea3c3ac03f735ba8932da8181b7 /data | |
| parent | 901d5e89ec6e3fb0f3d13f90f0495a4dda592454 (diff) | |
| download | vyos-1x-267b3213ef0e6ac4501470bef797796276879421.tar.gz vyos-1x-267b3213ef0e6ac4501470bef797796276879421.zip | |
accel-ppp: T2314: use common tempplate for chap-secrets
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/accel-ppp/chap-secrets.tmpl (renamed from data/templates/l2tp/chap-secrets.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/accel-ppp/l2tp.config.tmpl (renamed from data/templates/l2tp/l2tp.config.tmpl) | 1 | ||||
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.tmpl (renamed from data/templates/pppoe-server/pppoe.config.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/accel-ppp/sstp.config.tmpl (renamed from data/templates/sstp/sstp.config.tmpl) | 1 | ||||
| -rw-r--r-- | data/templates/pppoe-server/chap-secrets.tmpl | 10 | ||||
| -rw-r--r-- | data/templates/sstp/chap-secrets.tmpl | 10 |
6 files changed, 0 insertions, 22 deletions
diff --git a/data/templates/l2tp/chap-secrets.tmpl b/data/templates/accel-ppp/chap-secrets.tmpl index dd00d7bd0..dd00d7bd0 100644 --- a/data/templates/l2tp/chap-secrets.tmpl +++ b/data/templates/accel-ppp/chap-secrets.tmpl diff --git a/data/templates/l2tp/l2tp.config.tmpl b/data/templates/accel-ppp/l2tp.config.tmpl index 84f544203..ebe3aca29 100644 --- a/data/templates/l2tp/l2tp.config.tmpl +++ b/data/templates/accel-ppp/l2tp.config.tmpl @@ -143,4 +143,3 @@ vendor={{ radius_shaper_vendor }} [cli] tcp=127.0.0.1:2004 sessions-columns=ifname,username,calling-sid,ip,{{ ip6_column | join(',') }}{{ ',' if ip6_column }}rate-limit,type,comp,state,rx-bytes,tx-bytes,uptime - diff --git a/data/templates/pppoe-server/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl index 325b75adc..325b75adc 100644 --- a/data/templates/pppoe-server/pppoe.config.tmpl +++ b/data/templates/accel-ppp/pppoe.config.tmpl diff --git a/data/templates/sstp/sstp.config.tmpl b/data/templates/accel-ppp/sstp.config.tmpl index acdb6c76b..c3dc83429 100644 --- a/data/templates/sstp/sstp.config.tmpl +++ b/data/templates/accel-ppp/sstp.config.tmpl @@ -112,4 +112,3 @@ vendor={{ radius_shaper_vendor }} [cli] tcp=127.0.0.1:2005 - diff --git a/data/templates/pppoe-server/chap-secrets.tmpl b/data/templates/pppoe-server/chap-secrets.tmpl deleted file mode 100644 index dd00d7bd0..000000000 --- a/data/templates/pppoe-server/chap-secrets.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -# username server password acceptable local IP addresses shaper -{% for user in local_users %} -{% if user.state == 'enabled' %} -{% if user.upload and user.download %} -{{ "%-12s" | format(user.name) }} * {{ "%-16s" | format(user.password) }} {{ "%-16s" | format(user.ip) }} {{ user.download }} / {{ user.upload }} -{% else %} -{{ "%-12s" | format(user.name) }} * {{ "%-16s" | format(user.password) }} {{ "%-16s" | format(user.ip) }} -{% endif %} -{% endif %} -{% endfor %} diff --git a/data/templates/sstp/chap-secrets.tmpl b/data/templates/sstp/chap-secrets.tmpl deleted file mode 100644 index dd00d7bd0..000000000 --- a/data/templates/sstp/chap-secrets.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -# username server password acceptable local IP addresses shaper -{% for user in local_users %} -{% if user.state == 'enabled' %} -{% if user.upload and user.download %} -{{ "%-12s" | format(user.name) }} * {{ "%-16s" | format(user.password) }} {{ "%-16s" | format(user.ip) }} {{ user.download }} / {{ user.upload }} -{% else %} -{{ "%-12s" | format(user.name) }} * {{ "%-16s" | format(user.password) }} {{ "%-16s" | format(user.ip) }} -{% endif %} -{% endif %} -{% endfor %} |