diff options
| author | hagbard-01 <39653662+hagbard-01@users.noreply.github.com> | 2020-04-07 07:05:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 07:05:01 -0700 |
| commit | 34e9e428b51b0a8025d313f314a994439f4ed838 (patch) | |
| tree | 401bada0ae7848f551c61d899d8ea9551ef939b6 /data/templates | |
| parent | 8cc6bd529c76c2958999dcc379c418d748181731 (diff) | |
| parent | 8cbbd2a9b32176172c05d22da5502b464b68e3a1 (diff) | |
| download | vyos-1x-34e9e428b51b0a8025d313f314a994439f4ed838.tar.gz vyos-1x-34e9e428b51b0a8025d313f314a994439f4ed838.zip | |
Merge pull request #310 from DmitriyEshenko/fix-chap-secrets
l2tp: pptp: pppoe: T2237: Fix chap-secrets template format
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/l2tp/chap-secrets.tmpl | 7 | ||||
| -rw-r--r-- | data/templates/pppoe-server/chap-secrets.tmpl | 5 | ||||
| -rw-r--r-- | data/templates/pptp/chap-secrets.tmpl | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/data/templates/l2tp/chap-secrets.tmpl b/data/templates/l2tp/chap-secrets.tmpl index 323528b3c..0db295fdc 100644 --- a/data/templates/l2tp/chap-secrets.tmpl +++ b/data/templates/l2tp/chap-secrets.tmpl @@ -1,11 +1,10 @@ # username server password acceptable local IP addresses shaper {% for user in authentication['local-users'] %} {% if authentication['local-users'][user]['state'] == 'enabled' %} -{% if (authentication['local-users'][user]['upload']) and (authentication['local-users'][user]['download']) %} -{{user}}\t*\t{{authentication['local-users'][user]['passwd']}}\t{{authentication['local-users'][user]['ip']}}\t\ -{{authentication['local-users'][user]['download']}}/{{authentication['local-users'][user]['upload']}} +{% if authentication['local-users'][user]['upload'] and authentication['local-users'][user]['download'] %} +{{ "%-12s" | format(user) }} * {{ "%-16s" | format(authentication['local-users'][user]['passwd']) }} {{ "%-16s" | format(authentication['local-users'][user]['ip']) }} {{ authentication['local-users'][user]['download'] }} / {{ authentication['local-users'][user]['upload'] }} {% else %} -{{user}}\t*\t{{authentication['local-users'][user]['passwd']}}\t{{authentication['local-users'][user]['ip']}} +{{ "%-12s" | format(user) }} * {{ "%-16s" | format(authentication['local-users'][user]['passwd']) }} {{ "%-16s" | format(authentication['local-users'][user]['ip']) }} {% endif %} {% endif %} {% endfor %} diff --git a/data/templates/pppoe-server/chap-secrets.tmpl b/data/templates/pppoe-server/chap-secrets.tmpl index 808debccb..907ac6ed7 100644 --- a/data/templates/pppoe-server/chap-secrets.tmpl +++ b/data/templates/pppoe-server/chap-secrets.tmpl @@ -2,10 +2,9 @@ {% for user in authentication['local-users'] %} {% if authentication['local-users'][user]['state'] == 'enabled' %} {% if (authentication['local-users'][user]['upload']) and (authentication['local-users'][user]['download']) %} -{{user}}\t*\t{{authentication['local-users'][user]['passwd']}}\t{{authentication['local-users'][user]['ip']}}\t\ -{{authentication['local-users'][user]['download']}}/{{authentication['local-users'][user]['upload']}} +{{ "%-12s" | format(user) }} * {{ "%-16s" | format(authentication['local-users'][user]['passwd']) }} {{ "%-16s" | format(authentication['local-users'][user]['ip']) }} {{ authentication['local-users'][user]['download'] }} / {{ authentication['local-users'][user]['upload'] }} {% else %} -{{user}}\t*\t{{authentication['local-users'][user]['passwd']}}\t{{authentication['local-users'][user]['ip']}} +{{ "%-12s" | format(user) }} * {{ "%-16s" | format(authentication['local-users'][user]['passwd']) }} {{ "%-16s" | format(authentication['local-users'][user]['ip']) }} {% endif %} {% endif %} {% endfor %} diff --git a/data/templates/pptp/chap-secrets.tmpl b/data/templates/pptp/chap-secrets.tmpl index 6bfa2d64e..f93f4607b 100644 --- a/data/templates/pptp/chap-secrets.tmpl +++ b/data/templates/pptp/chap-secrets.tmpl @@ -1,6 +1,6 @@ # username server password acceptable local IP addresses {% for user in authentication['local-users'] %} {% if authentication['local-users'][user]['state'] == 'enabled' %} -{{user}}\t*\t{{authentication['local-users'][user]['passwd']}}\t{{authentication['local-users'][user]['ip']}} +{{ "%-12s" | format(user) }} * {{ "%-16s" | format(authentication['local-users'][user]['passwd']) }} {{ "%-16s" | format(authentication['local-users'][user]['ip']) }} {% endif %} {% endfor %} |