summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-04 19:13:31 +0200
committerChristian Poessinger <christian@poessinger.com>2020-10-04 19:13:31 +0200
commit136d81c13c79aa510404e8cf7a63ea631b017209 (patch)
tree213d0a7eb89ded6c242eec0bc2be67f6cbd4010a
parent3691fa4aa76b303f209beee3d24a0647c1116794 (diff)
downloadvyos-1x-136d81c13c79aa510404e8cf7a63ea631b017209.tar.gz
vyos-1x-136d81c13c79aa510404e8cf7a63ea631b017209.zip
pppoe-server: T2953: prepare common chap-secrets file
-rw-r--r--data/templates/accel-ppp/chap-secrets.config_dict.tmpl (renamed from data/templates/accel-ppp/chap-secrets.pppoe.tmpl)0
-rwxr-xr-xsrc/conf_mode/service_pppoe-server.py3
2 files changed, 2 insertions, 1 deletions
diff --git a/data/templates/accel-ppp/chap-secrets.pppoe.tmpl b/data/templates/accel-ppp/chap-secrets.config_dict.tmpl
index da64b64d5..da64b64d5 100644
--- a/data/templates/accel-ppp/chap-secrets.pppoe.tmpl
+++ b/data/templates/accel-ppp/chap-secrets.config_dict.tmpl
diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index 445311391..30b382c69 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -164,7 +164,8 @@ def generate(pppoe):
render(pppoe_conf, 'accel-ppp/pppoe.config.tmpl', pppoe, trim_blocks=True)
if vyos_dict_search('authentication.mode', pppoe) == 'local':
- render(pppoe_chap_secrets, 'accel-ppp/chap-secrets.pppoe.tmpl', pppoe, trim_blocks=True, permission=0o640)
+ render(pppoe_chap_secrets, 'accel-ppp/chap-secrets.config_dict.tmpl',
+ pppoe, trim_blocks=True, permission=0o640)
else:
if os.path.exists(pppoe_chap_secrets):
os.unlink(pppoe_chap_secrets)