diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-03 22:01:19 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-12-06 20:58:56 +0100 |
commit | 0d4d4dd840e06c18250d73f27de61261ff141944 (patch) | |
tree | 5c515082495983658e22d27b1a838b2598e3ecd8 /interface-definitions/https.xml | |
parent | 1ac177febfdd0dfc5a5b40a1b30294de0e2a45e0 (diff) | |
download | vyos-1x-0d4d4dd840e06c18250d73f27de61261ff141944.tar.gz vyos-1x-0d4d4dd840e06c18250d73f27de61261ff141944.zip |
T1843: run interface-definitions though GCC preprocessor
A lot of XML code is duplicated (VLAN, interface address) for instance. Such
XML definitions should be moved to feature.xml.i files and then just pulled in
via GCC preprocessor #include definition in e.g. bond or ethernet definitions.
This will give us the ability to single-source repeating node definitions as:
* Interface Address
* Interface Description
* Interface Disable
* VLAN (both vif-s and vif-c)
The .in suffix of the interface-definitions is a marker that those files are
input files to the GCC preprocessor. They will be rendered into proper XML
files in the build directory.
Some node definitions have been reworder to remove escaped double quote
occurances which would have been warned about by the GCC preprocessor.
Diffstat (limited to 'interface-definitions/https.xml')
-rw-r--r-- | interface-definitions/https.xml | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml deleted file mode 100644 index d9874a1f9..000000000 --- a/interface-definitions/https.xml +++ /dev/null @@ -1,135 +0,0 @@ -<?xml version="1.0"?> -<!-- HTTPS configuration --> -<interfaceDefinition> - <node name="service"> - <children> - <node name="https" owner="${vyos_conf_scripts_dir}/https.py"> - <properties> - <help>HTTPS configuration</help> - <priority>1001</priority> - </properties> - <children> - <tagNode name="listen-address"> - <properties> - <help>Addresses to listen for HTTPS requests</help> - <valueHelp> - <format>ipv4</format> - <description>HTTPS IPv4 address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>HTTPS IPv6 address</description> - </valueHelp> - <valueHelp> - <format>'*'</format> - <description>any</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - <regex>^\*$</regex> - </constraint> - </properties> - <children> - <leafNode name='listen-port'> - <properties> - <help>Port to listen for HTTPS requests; default 443</help> - <valueHelp> - <format>1-65535</format> - <description>Numeric IP port</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="server-name"> - <properties> - <help>Server names: exact, wildcard, regex, or '_' (any)</help> - <multi/> - </properties> - </leafNode> - </children> - </tagNode> - <node name="certificates"> - <properties> - <help>TLS certificates</help> - </properties> - <children> - <node name="system-generated-certificate" owner="${vyos_conf_scripts_dir}/vyos_cert.py"> - <properties> - <help>Use an automatically generated self-signed certificate</help> - <valueless/> - </properties> - <children> - <leafNode name="lifetime"> - <properties> - <help>Lifetime in days; default is 365</help> - <valueHelp> - <format>1-65535</format> - <description>Number of days</description> - </valueHelp> - </properties> - </leafNode> - </children> - </node> - </children> - </node> - <node name="api" owner="${vyos_conf_scripts_dir}/http-api.py"> - <properties> - <help>VyOS HTTP API configuration</help> - <priority>1002</priority> - </properties> - <children> - <leafNode name="port"> - <properties> - <help>Port for HTTP API service</help> - <valueHelp> - <format>1-65535</format> - <description>Numeric IP port</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <node name="keys"> - <properties> - <help>HTTP API keys</help> - </properties> - <children> - <tagNode name="id"> - <properties> - <help>HTTP API id</help> - </properties> - <children> - <leafNode name="key"> - <properties> - <help>HTTP API plaintext key</help> - </properties> - </leafNode> - </children> - </tagNode> - </children> - </node> - <leafNode name="strict"> - <properties> - <help>Enforce strict path checking</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="debug"> - <properties> - <help>Debug</help> - <valueless/> - <hidden/> - </properties> - </leafNode> - </children> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition> - |