diff options
| author | Lulu Cathrinus Grimalkin <e.altunbas@vyos.io> | 2021-08-15 13:10:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-15 12:10:20 +0200 |
| commit | 43fcc0db006a12024df1b49d6f3c9e99ce165226 (patch) | |
| tree | b946a2c680b65234e47544e74c5da7b5d8ff8ba2 /interface-definitions | |
| parent | 9b21e4a769385514f0bf625d665d588266dc6de4 (diff) | |
| download | vyos-1x-43fcc0db006a12024df1b49d6f3c9e99ce165226.tar.gz vyos-1x-43fcc0db006a12024df1b49d6f3c9e99ce165226.zip | |
conntrack: T3275: migrate 'disable' syntax to 'enable' syntax for the new default behavior
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/conntrack-module-disable.xml.i | 8 | ||||
| -rw-r--r-- | interface-definitions/system-conntrack.xml.in | 44 |
2 files changed, 15 insertions, 37 deletions
diff --git a/interface-definitions/include/conntrack-module-disable.xml.i b/interface-definitions/include/conntrack-module-disable.xml.i deleted file mode 100644 index f891225e0..000000000 --- a/interface-definitions/include/conntrack-module-disable.xml.i +++ /dev/null @@ -1,8 +0,0 @@ -<!-- include start from conntrack-module-disable.xml.i --> -<leafNode name="disable"> - <properties> - <help>Disable connection tracking helper</help> - <valueless/> - </properties> -</leafNode> -<!-- include end --> diff --git a/interface-definitions/system-conntrack.xml.in b/interface-definitions/system-conntrack.xml.in index fa73df3db..c408e9bdd 100644 --- a/interface-definitions/system-conntrack.xml.in +++ b/interface-definitions/system-conntrack.xml.in @@ -37,64 +37,50 @@ </leafNode> <node name="modules"> <properties> - <help>Connection tracking modules settings</help> + <help>Connection tracking modules</help> </properties> <children> <node name="ftp"> <properties> - <help>FTP connection tracking settings</help> + <help>FTP connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> <node name="h323"> <properties> - <help>H.323 connection tracking settings</help> + <help>H.323 connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> <node name="nfs"> <properties> - <help>NFS connection tracking settings</help> + <help>NFS connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> <node name="pptp"> <properties> - <help>PPTP connection tracking settings</help> + <help>PPTP connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> <node name="sip"> <properties> - <help>SIP connection tracking settings</help> + <help>SIP connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> <node name="sqlnet"> <properties> - <help>SQLnet connection tracking settings</help> + <help>SQLnet connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> <node name="tftp"> <properties> - <help>TFTP connection tracking settings</help> + <help>TFTP connection tracking</help> + <valueless/> </properties> - <children> - #include <include/conntrack-module-disable.xml.i> - </children> </node> </children> </node> |