diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-25 00:13:30 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-04-25 09:32:10 +0200 |
| commit | 4c7bf4768915c28e393b749f9ad42aaea18b9dc2 (patch) | |
| tree | e4aa8f524bbfbe4dc774d9b727b0cb1db82197f8 /op-mode-definitions | |
| parent | 92d0262d8d204189ba4ad4cfb93747fdc1b445e0 (diff) | |
| download | vyos-1x-4c7bf4768915c28e393b749f9ad42aaea18b9dc2.tar.gz vyos-1x-4c7bf4768915c28e393b749f9ad42aaea18b9dc2.zip | |
wireguard: T1802: add client name to configuration
(cherry picked from commit daf377aca3511e8ad74854828f3aaa1dd99f0a91)
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/wireguard.xml.in | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/op-mode-definitions/wireguard.xml.in b/op-mode-definitions/wireguard.xml.in index 9cc979b7b..7e16d87e9 100644 --- a/op-mode-definitions/wireguard.xml.in +++ b/op-mode-definitions/wireguard.xml.in @@ -26,33 +26,53 @@ </properties> <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey --location "$4"</command> </tagNode> - <tagNode name="mobile-config"> + <tagNode name="client-config"> <properties> - <help>Generate QR code and movile configuration for Wireguard interface</help> + <help>Generate Client config QR code</help> <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script> + <list><client-name></list> </completionHelp> </properties> <children> - <tagNode name="server"> + <tagNode name="interface"> <properties> - <help>IP address or FQDN the client will connect to</help> + <help>Local interface used for connection</help> <completionHelp> - <script>${vyos_completion_dir}/list_local_ips.sh --both</script> - <list><hostname></list> + <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/wireguard_client.py --interface "$4" --server "$6"</command> <children> - <tagNode name="address"> + <tagNode name="server"> <properties> - <help>IPv4/IPv6 address used on the client side</help> + <help>IP address/FQDN used for client connection</help> <completionHelp> <script>${vyos_completion_dir}/list_local_ips.sh --both</script> <list><hostname></list> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/wireguard_client.py --interface "$4" --server "$6" --address "$8"</command> + <command>sudo ${vyos_op_scripts_dir}/wireguard_client.py --name "$4" --interface "$6" --server "$8"</command> + <children> + <tagNode name="address"> + <properties> + <help>IPv4/IPv6 address used by client</help> + <completionHelp> + <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/wireguard_client.py --name "$4" --interface "$6" --server "$8" --address "${10}"</command> + <children> + <tagNode name="address"> + <properties> + <help>IPv4/IPv6 address used by client</help> + <completionHelp> + <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/wireguard_client.py --name "$4" --interface "$6" --server "$8" --address "${10}" --address "${12}"</command> + </tagNode> + </children> + </tagNode> + </children> </tagNode> </children> </tagNode> |