diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-07 17:32:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 17:32:00 +0200 |
| commit | 17dff308810497aab19428a6340a4261d91893e4 (patch) | |
| tree | 8bde3ac286bc552bea9322efcdda33e05e3a86e9 /interface-definitions | |
| parent | 511253635a9b67396788d24bacafd237594e0e12 (diff) | |
| parent | 5a7c46016a23387312b2c9e18528ad7bb20e8366 (diff) | |
| download | vyos-1x-17dff308810497aab19428a6340a4261d91893e4.tar.gz vyos-1x-17dff308810497aab19428a6340a4261d91893e4.zip | |
Merge pull request #912 from sarthurdev/pki_ipsec_rsa
pki: T3642: Migrate rsa-keys to PKI configuration
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/ipsec/authentication-rsa.xml.i | 30 | ||||
| -rw-r--r-- | interface-definitions/vpn_ipsec.xml.in | 6 | ||||
| -rw-r--r-- | interface-definitions/vpn_rsa-keys.xml.in | 47 |
3 files changed, 31 insertions, 52 deletions
diff --git a/interface-definitions/include/ipsec/authentication-rsa.xml.i b/interface-definitions/include/ipsec/authentication-rsa.xml.i new file mode 100644 index 000000000..0a364e838 --- /dev/null +++ b/interface-definitions/include/ipsec/authentication-rsa.xml.i @@ -0,0 +1,30 @@ +<!-- include start from ipsec/authentication-rsa.xml.i --> +<node name="rsa"> + <properties> + <help>RSA keys</help> + </properties> + <children> + <leafNode name="local-key"> + <properties> + <help>Name of PKI key-pair with local private key</help> + <completionHelp> + <path>pki key-pair</path> + </completionHelp> + </properties> + </leafNode> + <leafNode name="passphrase"> + <properties> + <help>Local private key passphrase</help> + </properties> + </leafNode> + <leafNode name="remote-key"> + <properties> + <help>Name of PKI key-pair with remote public key</help> + <completionHelp> + <path>pki key-pair</path> + </completionHelp> + </properties> + </leafNode> + </children> +</node> +<!-- include end --> diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in index 4425ab02a..147f351f2 100644 --- a/interface-definitions/vpn_ipsec.xml.in +++ b/interface-definitions/vpn_ipsec.xml.in @@ -922,6 +922,7 @@ </properties> <children> #include <include/ipsec/authentication-id.xml.i> + #include <include/ipsec/authentication-rsa.xml.i> #include <include/ipsec/authentication-x509.xml.i> <leafNode name="mode"> <properties> @@ -964,11 +965,6 @@ </valueHelp> </properties> </leafNode> - <leafNode name="rsa-key-name"> - <properties> - <help>RSA key name</help> - </properties> - </leafNode> <leafNode name="use-x509-id"> <properties> <help>Use certificate common name as ID</help> diff --git a/interface-definitions/vpn_rsa-keys.xml.in b/interface-definitions/vpn_rsa-keys.xml.in deleted file mode 100644 index 2d8e97f4f..000000000 --- a/interface-definitions/vpn_rsa-keys.xml.in +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="vpn"> - <children> - <node name="rsa-keys" owner="${vyos_conf_scripts_dir}/vpn_rsa-keys.py"> - <properties> - <help>RSA keys</help> - <priority>900</priority> - </properties> - <children> - <node name="local-key"> - <properties> - <help>Local RSA key</help> - </properties> - <children> - <leafNode name="file"> - <properties> - <help>Local RSA key file location</help> - <valueHelp> - <format>txt</format> - <description>File in /config/auth or /config/ipsec.d/rsa-keys</description> - </valueHelp> - </properties> - </leafNode> - </children> - </node> - <tagNode name="rsa-key-name"> - <properties> - <help>Name of remote RSA key</help> - </properties> - <children> - <leafNode name="rsa-key"> - <properties> - <help>Remote RSA key</help> - <valueHelp> - <format>txt</format> - <description>Remote RSA key</description> - </valueHelp> - </properties> - </leafNode> - </children> - </tagNode> - </children> - </node> - </children> - </node> -</interfaceDefinition> |