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/firewall.xml.in | |
| 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/firewall.xml.in')
| -rw-r--r-- | interface-definitions/firewall.xml.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in index 5528d6bc5..f07c619a8 100644 --- a/interface-definitions/firewall.xml.in +++ b/interface-definitions/firewall.xml.in @@ -91,7 +91,7 @@ <multi/> </properties> </leafNode> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> </children> </tagNode> <tagNode name="ipv6-address-group"> @@ -112,7 +112,7 @@ <multi/> </properties> </leafNode> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> </children> </tagNode> <tagNode name="ipv6-network-group"> @@ -120,7 +120,7 @@ <help>Network-group member</help> </properties> <children> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> <leafNode name="network"> <properties> <help>Network-group member</help> @@ -141,7 +141,7 @@ <help>Firewall network-group</help> </properties> <children> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> <leafNode name="network"> <properties> <help>Network-group member</help> @@ -162,7 +162,7 @@ <help>Firewall port-group</help> </properties> <children> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> <leafNode name="port"> <properties> <help>Port-group member</help> @@ -210,15 +210,15 @@ </properties> <children> #include <include/firewall/name-default-action.xml.i> - #include <include/firewall/description.xml.i> #include <include/firewall/name-default-log.xml.i> + #include <include/generic-description.xml.i> <tagNode name="rule"> <properties> <help>Rule number (1-9999)</help> </properties> <children> #include <include/firewall/action.xml.i> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> <node name="destination"> <properties> <help>Destination parameters</help> @@ -578,15 +578,15 @@ </properties> <children> #include <include/firewall/name-default-action.xml.i> - #include <include/firewall/description.xml.i> #include <include/firewall/name-default-log.xml.i> + #include <include/generic-description.xml.i> <tagNode name="rule"> <properties> <help>Rule number (1-9999)</help> </properties> <children> #include <include/firewall/action.xml.i> - #include <include/firewall/description.xml.i> + #include <include/generic-description.xml.i> <node name="destination"> <properties> <help>Destination parameters</help> |