diff options
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/dns-forwarding.xml.in | 19 | ||||
-rw-r--r-- | interface-definitions/include/dhcp-server-domain-search.xml.i | 24 | ||||
-rw-r--r-- | interface-definitions/include/listen-address.xml.i | 20 | ||||
-rw-r--r-- | interface-definitions/ntp.xml.in | 19 | ||||
-rw-r--r-- | interface-definitions/ssh.xml.in | 19 | ||||
-rw-r--r-- | interface-definitions/tftp-server.xml.in | 32 | ||||
-rw-r--r-- | interface-definitions/vpn_openconnect.xml.in | 19 |
7 files changed, 38 insertions, 114 deletions
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index 62fb8b946..ad6eb2463 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -128,24 +128,7 @@ </constraint> </properties> </leafNode> - <leafNode name="listen-address"> - <properties> - <help>Addresses to listen for DNS queries [REQUIRED]</help> - <valueHelp> - <format>ipv4</format> - <description>Domain Name Server (DNS) IPv4 address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>Domain Name Server (DNS) IPv6 address</description> - </valueHelp> - <multi/> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> + #include <include/listen-address.xml.i> <leafNode name="negative-ttl"> <properties> <help>Maximum amount of time negative entries are cached (default: 3600)</help> diff --git a/interface-definitions/include/dhcp-server-domain-search.xml.i b/interface-definitions/include/dhcp-server-domain-search.xml.i index 8b76c4e70..9b3568b72 100644 --- a/interface-definitions/include/dhcp-server-domain-search.xml.i +++ b/interface-definitions/include/dhcp-server-domain-search.xml.i @@ -1,12 +1,12 @@ -<!-- included start from dhcp-server-domain-search.xml.i -->
-<leafNode name="domain-search">
- <properties>
- <help>Client Domain Name search list</help>
- <constraint>
- <validator name="fqdn"/>
- </constraint>
- <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
- <multi/>
- </properties>
-</leafNode>
-<!-- included end -->
+<!-- included start from dhcp-server-domain-search.xml.i --> +<leafNode name="domain-search"> + <properties> + <help>Client Domain Name search list</help> + <constraint> + <validator name="fqdn"/> + </constraint> + <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers, period, and underscore.</constraintErrorMessage> + <multi/> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/listen-address.xml.i b/interface-definitions/include/listen-address.xml.i new file mode 100644 index 000000000..e474344e4 --- /dev/null +++ b/interface-definitions/include/listen-address.xml.i @@ -0,0 +1,20 @@ +<!-- included start from listen-address.xml.i --> +<leafNode name="listen-address"> + <properties> + <help>Local IP addresses for service to listen on</help> + <valueHelp> + <format>ipv4</format> + <description>IP address to listen for incoming connections</description> + </valueHelp> + <valueHelp> + <format>ipv6</format> + <description>IPv6 address to listen for incoming connections</description> + </valueHelp> + <multi/> + <constraint> + <validator name="ipv4-address"/> + <validator name="ipv6-address"/> + </constraint> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in index 485487a42..6070cafe0 100644 --- a/interface-definitions/ntp.xml.in +++ b/interface-definitions/ntp.xml.in @@ -58,24 +58,7 @@ </leafNode> </children> </node> - <leafNode name="listen-address"> - <properties> - <help>Addresses to listen for NTP queries</help> - <valueHelp> - <format>ipv4</format> - <description>Network Time Protocol (NTP) IPv4 address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>Network Time Protocol (NTP) IPv6 address</description> - </valueHelp> - <multi/> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> + #include <include/listen-address.xml.i> #include <include/interface-vrf.xml.i> </children> </node> diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in index d253c2f34..3db740131 100644 --- a/interface-definitions/ssh.xml.in +++ b/interface-definitions/ssh.xml.in @@ -110,24 +110,7 @@ </constraint> </properties> </leafNode> - <leafNode name="listen-address"> - <properties> - <help>Local addresses SSH service should listen on</help> - <valueHelp> - <format>ipv4</format> - <description>IP address to listen for incoming connections</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>IPv6 address to listen for incoming connections</description> - </valueHelp> - <multi/> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> + #include <include/listen-address.xml.i> <leafNode name="loglevel"> <properties> <help>Log level</help> diff --git a/interface-definitions/tftp-server.xml.in b/interface-definitions/tftp-server.xml.in index 2874b034c..6458aaba2 100644 --- a/interface-definitions/tftp-server.xml.in +++ b/interface-definitions/tftp-server.xml.in @@ -20,36 +20,8 @@ <valueless/> </properties> </leafNode> - <leafNode name="port"> - <properties> - <help>Port for TFTP service</help> - <valueHelp> - <format>1-65535</format> - <description>Numeric IP port (default: 69)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="listen-address"> - <properties> - <help>Addresses for TFTP server to listen [REQUIRED]</help> - <valueHelp> - <format>ipv4</format> - <description>TFTP IPv4 listen address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>TFTP IPv6 listen address</description> - </valueHelp> - <multi/> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> + #include <include/port-number.xml.i> + #include <include/listen-address.xml.i> </children> </node> </children> diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in index 16fe660a9..203f85bbc 100644 --- a/interface-definitions/vpn_openconnect.xml.in +++ b/interface-definitions/vpn_openconnect.xml.in @@ -231,24 +231,7 @@ </leafNode> </children> </node> - <leafNode name="name-server"> - <properties> - <help>Domain Name Server (DNS) propagated to client</help> - <valueHelp> - <format>ipv4</format> - <description>Domain Name Server (DNS) IPv4 address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>Domain Name Server (DNS) IPv6 address</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - <multi/> - </properties> - </leafNode> + #include <include/accel-name-server.xml.i> </children> </node> </children> |