diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-19 19:25:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 19:25:48 +0200 |
| commit | a2e708384f1e1136016ceb7c45494a9a3ddaeb49 (patch) | |
| tree | 4ee54246820dacee33eba93504f83ae5f962025a /op-mode-definitions | |
| parent | 02043297db68d45b2ca398486cc119d1c103e68c (diff) | |
| parent | c96c3ea2ed672394b04fcae924d351565ec9dc6c (diff) | |
| download | vyos-1x-a2e708384f1e1136016ceb7c45494a9a3ddaeb49.tar.gz vyos-1x-a2e708384f1e1136016ceb7c45494a9a3ddaeb49.zip | |
Merge pull request #929 from sarthurdev/pki_wg
pki: wireguard: T3642: Migrate Wireguard private key directly into CLI
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/wireguard.xml.in | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/op-mode-definitions/wireguard.xml.in b/op-mode-definitions/wireguard.xml.in index a84980b44..ac3daa3b8 100644 --- a/op-mode-definitions/wireguard.xml.in +++ b/op-mode-definitions/wireguard.xml.in @@ -8,24 +8,6 @@ <help>Generate Wireguard keys</help> </properties> <children> - <leafNode name="default-keypair"> - <properties> - <help>Generate the default Wireguard keypair</help> - </properties> - <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey</command> - </leafNode> - <leafNode name="preshared-key"> - <properties> - <help>Generate a Wireguard preshared key</help> - </properties> - <command>${vyos_op_scripts_dir}/wireguard.py --genpsk</command> - </leafNode> - <tagNode name="named-keypairs"> - <properties> - <help>Generate specified Wireguard keypairs</help> - </properties> - <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey --location "$4"</command> - </tagNode> <tagNode name="client-config"> <properties> <help>Generate Client config QR code</help> @@ -94,25 +76,20 @@ <help>Show Wireguard keys</help> </properties> <children> - <tagNode name="pubkey"> + <leafNode name="pubkey"> <properties> - <help>Show specified Wireguard public key</help> - <completionHelp> - <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script> - </completionHelp> + <help>Show Wireguard public keys</help> </properties> - <command>${vyos_op_scripts_dir}/wireguard.py --showpub --location "$5"</command> - </tagNode> - <tagNode name="privkey"> + <command>${vyos_op_scripts_dir}/wireguard.py --showpub</command> + </leafNode> + <leafNode name="privkey"> <properties> - <help>Show specified Wireguard private key</help> - <completionHelp> - <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script> - </completionHelp> + <help>Show Wireguard private keys</help> </properties> - <command>${vyos_op_scripts_dir}/wireguard.py --showpriv --location "$5"</command> - </tagNode> + <command>${vyos_op_scripts_dir}/wireguard.py --showpriv</command> + </leafNode> </children> + <command>${vyos_op_scripts_dir}/wireguard.py --showpub --showpriv</command> </node> </children> </node> |