diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-16 16:12:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 16:12:43 +0200 |
| commit | 30b85d8316abde986f5ec10cd3365786a0eb88ed (patch) | |
| tree | 100d6729b22a2dec3fc1dffa30dad2f0d7bcdcd4 /data/templates/ipoe-server | |
| parent | f50877bff8afed409f02d2978da6a70c383ccea1 (diff) | |
| parent | 3c4e32ec1f09d709cf99c94e84c4c647418ae57f (diff) | |
| download | vyos-1x-30b85d8316abde986f5ec10cd3365786a0eb88ed.tar.gz vyos-1x-30b85d8316abde986f5ec10cd3365786a0eb88ed.zip | |
Merge pull request #347 from DmitriyEshenko/fix-ipoe
ipoe: T2294: Fix templates and migrate to systemd
Diffstat (limited to 'data/templates/ipoe-server')
| -rw-r--r-- | data/templates/ipoe-server/chap-secrets.tmpl | 32 | ||||
| -rw-r--r-- | data/templates/ipoe-server/ipoe.config.tmpl | 21 |
2 files changed, 22 insertions, 31 deletions
diff --git a/data/templates/ipoe-server/chap-secrets.tmpl b/data/templates/ipoe-server/chap-secrets.tmpl index 707718e94..5e35d5775 100644 --- a/data/templates/ipoe-server/chap-secrets.tmpl +++ b/data/templates/ipoe-server/chap-secrets.tmpl @@ -1,18 +1,18 @@ # username server password acceptable local IP addresses shaper -{% for aifc in auth['auth_if'] %} -{% for mac in auth['auth_if'][aifc] %} -{% if (auth['auth_if'][aifc][mac]['up']) and (auth['auth_if'][aifc][mac]['down']) %} +{% for aifc in auth['auth_if'] -%} +{% for mac in auth['auth_if'][aifc] -%} +{% if (auth['auth_if'][aifc][mac]['up']) and (auth['auth_if'][aifc][mac]['down']) -%} +{% if auth['auth_if'][aifc][mac]['vlan'] -%} +{{aifc}}.{{auth['auth_if'][aifc][mac]['vlan']}} * {{mac.lower()}} * {{auth['auth_if'][aifc][mac]['down']}}/{{auth['auth_if'][aifc][mac]['up']}} +{% else -%} +{{aifc}} * {{mac.lower()}} * {{auth['auth_if'][aifc][mac]['down']}}/{{auth['auth_if'][aifc][mac]['up']}} +{% endif -%} +{% else -%} {% if auth['auth_if'][aifc][mac]['vlan'] %} -{{aifc}}.{{auth['auth_if'][aifc][mac]['vlan']}}\t*\t{{mac.lower()}}\t*\t{{auth['auth_if'][aifc][mac]['down']}}/{{auth['auth_if'][aifc][mac]['up']}} -{% else %} -{{aifc}}\t*\t{{mac.lower()}}\t*\t{{auth['auth_if'][aifc][mac]['down']}}/{{auth['auth_if'][aifc][mac]['up']}} -{% endif %} -{% else %} -{% if auth['auth_if'][aifc][mac]['vlan'] %} -{{aifc}}.{{auth['auth_if'][aifc][mac]['vlan']}}\t*\t{{mac.lower()}}\t* -{% else %} -{{aifc}}\t*\t{{mac.lower()}}\t* -{% endif %} -{% endif %} -{% endfor %} -{% endfor %} +{{aifc}}.{{auth['auth_if'][aifc][mac]['vlan']}} * {{mac.lower()}} * +{% else -%} +{{aifc}} * {{mac.lower()}} * +{% endif -%} +{% endif -%} +{% endfor -%} +{% endfor -%} diff --git a/data/templates/ipoe-server/ipoe.config.tmpl b/data/templates/ipoe-server/ipoe.config.tmpl index 109bc0d92..0a5ee09a6 100644 --- a/data/templates/ipoe-server/ipoe.config.tmpl +++ b/data/templates/ipoe-server/ipoe.config.tmpl @@ -26,16 +26,7 @@ level=5 verbose=1 {% for intfc in interfaces %} {% if interfaces[intfc]['vlan_mon'] %} -interface=re:{{intfc}}\.\d+,\ -{% else %} -interface={{intfc}},\ -{% endif %} -shared={{interfaces[intfc]['shared']}},\ -mode={{interfaces[intfc]['mode']}},\ -ifcfg={{interfaces[intfc]['ifcfg']}},\ -range={{interfaces[intfc]['range']}},\ -start={{interfaces[intfc]['sess_start']}},\ -ipv6=1 +interface=re:{{intfc}}\.\d+,{% else %}interface={{intfc}},{% endif %}shared={{interfaces[intfc]['shared']}},mode={{interfaces[intfc]['mode']}},ifcfg={{interfaces[intfc]['ifcfg']}},range={{interfaces[intfc]['range']}},start={{interfaces[intfc]['sess_start']}},ipv6=1 {% endfor %} {% if auth['mech'] == 'noauth' %} noauth=1 @@ -86,20 +77,20 @@ delegate={{pd}} {% if auth['mech'] == 'local' %} [chap-secrets] -chap-secrets=/etc/accel-ppp/ipoe/chap-secrets +chap-secrets={{chap_secrets_file}} {% endif %} {% if auth['mech'] == 'radius' %} [radius] verbose=1 {% for srv in auth['radius'] %} -server={{srv}},{{auth['radius'][srv]['secret']}},\ -req-limit={{auth['radius'][srv]['req-limit']}},\ +server={{srv}},{{auth['radius'][srv]['secret']}}, +req-limit={{auth['radius'][srv]['req-limit']}}, fail-time={{auth['radius'][srv]['fail-time']}} {% endfor %} {% if auth['radsettings']['dae-server']['ip-address'] %} -dae-server={{auth['radsettings']['dae-server']['ip-address']}}:\ -{{auth['radsettings']['dae-server']['port']}},\ +dae-server={{auth['radsettings']['dae-server']['ip-address']}}: +{{auth['radsettings']['dae-server']['port']}}, {{auth['radsettings']['dae-server']['secret']}} {% endif -%} {% if auth['radsettings']['acct-timeout'] %} |