diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-04-18 21:49:02 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-04-18 21:49:02 +0200 |
commit | 6da4b10139787dc1096c7a0d4b0cae5120caf870 (patch) | |
tree | 93c3331f21190c9799a6d04b01eb605159da400a | |
parent | efa172449e05328f8bea8d6879d5d38386b72e95 (diff) | |
download | vyos-1x-6da4b10139787dc1096c7a0d4b0cae5120caf870.tar.gz vyos-1x-6da4b10139787dc1096c7a0d4b0cae5120caf870.zip |
ipoe-server: T2324: move template files to common accel-ppp template directory
-rw-r--r-- | data/templates/accel-ppp/chap-secrets.ipoe.tmpl (renamed from data/templates/ipoe-server/chap-secrets.tmpl) | 0 | ||||
-rw-r--r-- | data/templates/accel-ppp/ipoe.config.tmpl (renamed from data/templates/ipoe-server/ipoe.config.tmpl) | 0 | ||||
-rwxr-xr-x | src/conf_mode/service_ipoe-server.py | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/ipoe-server/chap-secrets.tmpl b/data/templates/accel-ppp/chap-secrets.ipoe.tmpl index a7d899354..a7d899354 100644 --- a/data/templates/ipoe-server/chap-secrets.tmpl +++ b/data/templates/accel-ppp/chap-secrets.ipoe.tmpl diff --git a/data/templates/ipoe-server/ipoe.config.tmpl b/data/templates/accel-ppp/ipoe.config.tmpl index 19d8b199d..19d8b199d 100644 --- a/data/templates/ipoe-server/ipoe.config.tmpl +++ b/data/templates/accel-ppp/ipoe.config.tmpl diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py index 428d8d5d5..860458e0e 100755 --- a/src/conf_mode/service_ipoe-server.py +++ b/src/conf_mode/service_ipoe-server.py @@ -269,10 +269,10 @@ def generate(ipoe): if not os.path.exists(dirname): os.mkdir(dirname) - render(ipoe_conf, 'ipoe-server/ipoe.config.tmpl', ipoe, trim_blocks=True) + render(ipoe_conf, 'accel-ppp/ipoe.config.tmpl', ipoe, trim_blocks=True) if ipoe['auth_mode'] == 'local': - render(ipoe_chap_secrets, 'ipoe-server/chap-secrets.tmpl', ipoe) + render(ipoe_chap_secrets, 'accel-ppp/chap-secrets.ipoe.tmpl', ipoe) os.chmod(ipoe_chap_secrets, S_IRUSR | S_IWUSR | S_IRGRP) else: |