summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-11Merge branch 't2264-l2tp' of github.com:c-po/vyos-1x into currentChristian Poessinger
* '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 ...
2020-04-11vpn: l2tp: sstp: T2264: create config dir on demandChristian Poessinger
2020-04-11Merge pull request #326 from thomas-mangin/T2265Christian Poessinger
dhcp: T2265: refactor DHCP class
2020-04-11vpn: l2tp: T2264: migrate IPv6 prefix node to common CLI styleChristian Poessinger
Combining multiple options into a single CLI node is considered bad practice. IPv6 prefixes consited of the prefix itself and a mask send to the client in one node only. The following CLI parts have been migrated from client-ipv6-pool { delegate-prefix fc00:0:1::/48,64 prefix 2001:db8::/64,64 } to client-ipv6-pool { delegate fc00:0:1::/48 { delegation-prefix 48 } prefix 2001:db8::/48 { mask 64 } } Thus regular validation steps from the VyOS CLI can be used when a prefix is configured.
2020-04-11dhcp: T2230: use external template filesThomas Mangin
2020-04-11template: T2230: helper to generate templatesThomas Mangin
Currently the pattern is to import jinja2 and re-generate the template in every file. Dimitriy reported a reduction in performance (1s) when commiting. This code provide an helper function which caches the Environment and template renderer, and can generate template from one line (instead of the few currently)
2020-04-11vpn: l2tp: T2264: simplify IPv6 config dictionary elementsChristian Poessinger
2020-04-11dhcp: T2265: refactor DHCP classThomas Mangin
Break the code between v4 and v6, remove need for getter/setter as they are just exposing the underlying dict. Move FixedDict from tunnel code and expose it to other part so it can be used to prevent accidental change to the dhcp option if no default exists already.
2020-04-11dhcp: T2265: v4/v6 conflict for lease fileThomas Mangin
The vyatta-dhclient-hook is not differentiating between v4 and v6 and attempting to use the same lease file for both protocol. Therefore only dhcp v4 or v6 could be setup on an interface and not both.
2020-04-11vpn: sstp: T2008: migrate from SysVinit -> systemdChristian Poessinger
2020-04-11vpn: sstp: T2008: bugfix KeyError 'client_gateway'Christian Poessinger
2020-04-11vpn: l2tp: T2264: migrate from SysVinit -> systemdChristian Poessinger
2020-04-11vpn: l2tp: T2264: remove debug pprintChristian Poessinger
2020-04-11vpn: l2tp: T2264: proper set PPP default values to ease Jinja2 templateChristian Poessinger
2020-04-11vpn: l2tp: T2110: re-use RADIUS XML include fileChristian Poessinger
2020-04-11vpn: l2tp: T2264: remove RADIUS req-limit nodeChristian Poessinger
It makes less sense for the user to specify this behavior.
2020-04-11vpn: l2tp: T2264: migrate to new dictionary keys for radius authChristian Poessinger
2020-04-11vpn: sstp: T2008: set accell default values in config dictChristian Poessinger
This will remove the required if/else parts int he Jinja2 template.
2020-04-11vpn: l2tp: T2264: use "with open()" when writing configChristian Poessinger
2020-04-11vpn: l2tp: T2264: migrate to new dictionary keys for local authChristian Poessinger
2020-04-11vpn: sstp: T2008: improve error message for non existent local-usersChristian Poessinger
2020-04-11vpn: l2tp: T2264: cleanup thread_cnt generationChristian Poessinger
2020-04-11vpn: sstp: T2008: cleanup thread_cnt generationChristian Poessinger
2020-04-11vpn: l2tp: T2264: combine WINS CLI syntaxChristian Poessinger
There is no reason to distinguish between WINS servers in terms of priority. This is solely a task which can be done in the underlaying Python scripts.
2020-04-11vpn: l2tp: T2264: combine IPv4/IPv6 name-server CLI syntaxChristian Poessinger
There is no reason to distinguish between an IPv4 and IPv6 name-server node on the CLI - this can be done in the underlaying Python scripts.
2020-04-11vpn: sstp: T2008: adjust DNS error messageChristian Poessinger
2020-04-11vpn: l2tp: T2264: comment cleanup on chk_con()Christian Poessinger
2020-04-11vpn: l2tp: T2264: use default_config_data dictChristian Poessinger
2020-04-11vpn: l2tp: T2264: introduce common config baseChristian Poessinger
2020-04-11vpn: l2tp: T2264: import cleanupChristian Poessinger
2020-04-11vpn: l2tp: T2264: rename files to match CLI levelsChristian Poessinger
2020-04-11Merge pull request #327 from DmitriyEshenko/fix-res-raChristian Poessinger
sstp: T2263: Implement reset feature
2020-04-11Merge pull request #328 from DmitriyEshenko/patch-12Christian Poessinger
sstp: T2269: Set template for tunnel names
2020-04-11sstp: T2269: Set template for tunnel namesEshenko Dmitriy
2020-04-10sstp: T2263: Implement reset featureDmitriyEshenko
2020-04-10Merge pull request #324 from DmitriyEshenko/fix-res-raChristian Poessinger
pptp: l2tp: T2262: Fix call to function run()
2020-04-10pptp: l2tp: T2262: Fix call to function run()DmitriyEshenko
2020-04-10Merge pull request #323 from jjakob/openvpn-verify-bridge-fixChristian Poessinger
openvpn: T2266: fix verify for client-server bridged mode
2020-04-10openvpn: T2266: fix verify for client-server bridged modejjakob
2020-04-10Merge pull request #230 from DaniilHarun/upstreamhagbard-01
ipoe-server: T2073: reset op-mode command for sessions
2020-04-10Merge branch 'upstream' of https://github.com/DaniilHarun/vyos-1x into upstreamDaniil Kharun
2020-04-10ipoe-server: T2073: reset op-mode command for sessionsDaniil Kharun
2020-04-10util: T2253: fix translation to cmdJohn Estabrook
2020-04-10Revert "Revert "util: T2226: rewrite merge config to use cmd""John Estabrook
This reverts commit 6086b7fa718f502563a17569abc81d4ccb94818c.
2020-04-10util: T2253: fix translation of subprocess.check_output to cmdJohn Estabrook
2020-04-10Revert "Revert "util: T2226: rewrite remote function helpers to use cmd""John Estabrook
This reverts commit 10717c6a3cdf7da7025b03c1abdbd813b4970b19.
2020-04-10l2tp: xml: group interface definition into vpn sectionChristian Poessinger
2020-04-10pppoe: T2248: connect-on-demand and vrf are mutually exclusiveChristian Poessinger
As PPP can be used to establish a connection on-demand it manages the Kernel default route. This can not be used when using VRFs which are managed by the ip-up.d and ip-down.d scripts - thus those options are now mutially exclusive. The best fix would be adding support for VRFs into PPP.
2020-04-10Merge pull request #321 from jjakob/openvpn-ccd-fixChristian Poessinger
openvpn: T2261: re-add ccd to template (was removed by mistake)
2020-04-10openvpn: T2261: re-add ccd to template (was removed by mistake)jjakob
Commit ef27cef0 mistakenly removed client-config-dir from the server template.