diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-04-11 19:14:11 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-04-11 19:14:11 +0200 |
commit | 867fc8d75380fee36dab7d495b835b19e7dafd58 (patch) | |
tree | 05a441f2cf0a3fb133465ef960550e59f3273039 /data/templates/sstp | |
parent | c27f13ab459ef5116eeac417d256abfabf2690c2 (diff) | |
parent | 0edca98b751faa3f3817fe4899d2822daade4212 (diff) | |
download | vyos-1x-867fc8d75380fee36dab7d495b835b19e7dafd58.tar.gz vyos-1x-867fc8d75380fee36dab7d495b835b19e7dafd58.zip |
Merge branch 't2264-l2tp' of github.com:c-po/vyos-1x into current
* 't2264-l2tp' of github.com:c-po/vyos-1x: (25 commits)
vpn: l2tp: sstp: T2264: create config dir on demand
vpn: l2tp: T2264: migrate IPv6 prefix node to common CLI style
vpn: l2tp: T2264: simplify IPv6 config dictionary elements
vpn: sstp: T2008: migrate from SysVinit -> systemd
vpn: sstp: T2008: bugfix KeyError 'client_gateway'
vpn: l2tp: T2264: migrate from SysVinit -> systemd
vpn: l2tp: T2264: remove debug pprint
vpn: l2tp: T2264: proper set PPP default values to ease Jinja2 template
vpn: l2tp: T2110: re-use RADIUS XML include file
vpn: l2tp: T2264: remove RADIUS req-limit node
vpn: l2tp: T2264: migrate to new dictionary keys for radius auth
vpn: sstp: T2008: set accell default values in config dict
vpn: l2tp: T2264: use "with open()" when writing config
vpn: l2tp: T2264: migrate to new dictionary keys for local auth
vpn: sstp: T2008: improve error message for non existent local-users
vpn: l2tp: T2264: cleanup thread_cnt generation
vpn: sstp: T2008: cleanup thread_cnt generation
vpn: l2tp: T2264: combine WINS CLI syntax
vpn: l2tp: T2264: combine IPv4/IPv6 name-server CLI syntax
vpn: sstp: T2008: adjust DNS error message
...
Diffstat (limited to 'data/templates/sstp')
-rw-r--r-- | data/templates/sstp/sstp.config.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/templates/sstp/sstp.config.tmpl b/data/templates/sstp/sstp.config.tmpl index 6c09c52ad..d38bb5062 100644 --- a/data/templates/sstp/sstp.config.tmpl +++ b/data/templates/sstp/sstp.config.tmpl @@ -53,7 +53,7 @@ dns{{ loop.index }}={{ dns }} {% if auth_mode == 'local' %} [chap-secrets] -chap-secrets=/etc/accel-ppp/sstp/chap-secrets +chap-secrets={{ sstp_chap_secrets }} {% elif auth_mode == 'radius' %} [radius] verbose=1 |