diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-03 15:42:03 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-07-03 15:42:03 +0200 |
| commit | dcfeb0de0a510d00c37101da50205b51dd464d72 (patch) | |
| tree | 4352ed737a931a3d6fbbfb6ecd99cfb84f34661f /interface-definitions/include | |
| parent | 13924804aafa9a43b4a300fb9afbdf29b69603fb (diff) | |
| parent | 1e74c0df2179c60036e440e15ed9036163039b2a (diff) | |
| download | vyos-1x-dcfeb0de0a510d00c37101da50205b51dd464d72.tar.gz vyos-1x-dcfeb0de0a510d00c37101da50205b51dd464d72.zip | |
Merge branch 'ipsec-ikev2-remote-access' of github.com:c-po/vyos-1x into current
* 'ipsec-ikev2-remote-access' of github.com:c-po/vyos-1x:
ipsec: T2816: remove default values from Jinja2 template and place them in XML
ipsec: T2816: rework IKE and ESP key assignment
ipsec: T2816: add Jinja2 converter for ESP/IKE groups to string
ipsec: T2816: adjust Jinja2 template to coding style
xml: provide building block for a generic description node
Diffstat (limited to 'interface-definitions/include')
| -rw-r--r-- | interface-definitions/include/firewall/common-rule.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/include/firewall/description.xml.i | 11 | ||||
| -rw-r--r-- | interface-definitions/include/generic-description.xml.i (renamed from interface-definitions/include/policy/description.xml.i) | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/interface-definitions/include/firewall/common-rule.xml.i b/interface-definitions/include/firewall/common-rule.xml.i index 466599e0a..1ee8da73d 100644 --- a/interface-definitions/include/firewall/common-rule.xml.i +++ b/interface-definitions/include/firewall/common-rule.xml.i @@ -1,6 +1,6 @@ <!-- include start from firewall/common-rule.xml.i --> #include <include/firewall/action.xml.i> -#include <include/firewall/description.xml.i> +#include <include/generic-description.xml.i> <leafNode name="disable"> <properties> <help>Option to disable firewall rule</help> diff --git a/interface-definitions/include/firewall/description.xml.i b/interface-definitions/include/firewall/description.xml.i deleted file mode 100644 index b6bae406b..000000000 --- a/interface-definitions/include/firewall/description.xml.i +++ /dev/null @@ -1,11 +0,0 @@ -<!-- include start from firewall/description.xml.i --> -<leafNode name="description"> - <properties> - <help>Description</help> - <valueHelp> - <format>txt</format> - <description>Description</description> - </valueHelp> - </properties> -</leafNode> -<!-- include end --> diff --git a/interface-definitions/include/policy/description.xml.i b/interface-definitions/include/generic-description.xml.i index e2ff35d02..03fc564e6 100644 --- a/interface-definitions/include/policy/description.xml.i +++ b/interface-definitions/include/generic-description.xml.i @@ -1,4 +1,4 @@ -<!-- include start from policy/description.xml.i --> +<!-- include start from generic-description.xml.i --> <leafNode name="description"> <properties> <help>Description</help> |