From f325d869515e008b09a8f2de7a4bda81dffd1158 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 26 Sep 2020 12:49:04 +0200 Subject: xml: interface-definitions: fix wrong file extension of inlcude files Files which are included by others whouls have the ".xml.i" extension. --- .../include/accel-client-ipv6-pool.xml.i | 59 ++++++++++ .../include/accel-client-ipv6-pool.xml.in | 59 ---------- .../include/accel-name-server.xml.i | 18 +++ .../include/accel-name-server.xml.in | 18 --- .../include/accel-radius-additions.xml.i | 125 +++++++++++++++++++++ .../include/accel-radius-additions.xml.in | 125 --------------------- interface-definitions/service_ipoe-server.xml.in | 6 +- interface-definitions/service_pppoe-server.xml.in | 6 +- interface-definitions/vpn_l2tp.xml.in | 4 +- interface-definitions/vpn_pptp.xml.in | 2 +- interface-definitions/vpn_sstp.xml.in | 6 +- 11 files changed, 214 insertions(+), 214 deletions(-) create mode 100644 interface-definitions/include/accel-client-ipv6-pool.xml.i delete mode 100644 interface-definitions/include/accel-client-ipv6-pool.xml.in create mode 100644 interface-definitions/include/accel-name-server.xml.i delete mode 100644 interface-definitions/include/accel-name-server.xml.in create mode 100644 interface-definitions/include/accel-radius-additions.xml.i delete mode 100644 interface-definitions/include/accel-radius-additions.xml.in diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-client-ipv6-pool.xml.i new file mode 100644 index 000000000..455ada6ef --- /dev/null +++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i @@ -0,0 +1,59 @@ + + + Pool of client IPv6 addresses + + + + + Pool of addresses used to assign to clients + + ipv6net + IPv6 address and prefix length + + + + + + + + + Prefix length used for individual client + + <48-128> + Client prefix length (default: 64) + + + + + + + + + + + Subnet used to delegate prefix through DHCPv6-PD (RFC3633) + + ipv6net + IPv6 address and prefix length + + + + + + + + + Prefix length delegated to client + + <32-64> + Delegated prefix length + + + + + + + + + + diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.in b/interface-definitions/include/accel-client-ipv6-pool.xml.in deleted file mode 100644 index 455ada6ef..000000000 --- a/interface-definitions/include/accel-client-ipv6-pool.xml.in +++ /dev/null @@ -1,59 +0,0 @@ - - - Pool of client IPv6 addresses - - - - - Pool of addresses used to assign to clients - - ipv6net - IPv6 address and prefix length - - - - - - - - - Prefix length used for individual client - - <48-128> - Client prefix length (default: 64) - - - - - - - - - - - Subnet used to delegate prefix through DHCPv6-PD (RFC3633) - - ipv6net - IPv6 address and prefix length - - - - - - - - - Prefix length delegated to client - - <32-64> - Delegated prefix length - - - - - - - - - - diff --git a/interface-definitions/include/accel-name-server.xml.i b/interface-definitions/include/accel-name-server.xml.i new file mode 100644 index 000000000..82ed6771d --- /dev/null +++ b/interface-definitions/include/accel-name-server.xml.i @@ -0,0 +1,18 @@ + + + Domain Name Server (DNS) propagated to client + + ipv4 + Domain Name Server (DNS) IPv4 address + + + ipv6 + Domain Name Server (DNS) IPv6 address + + + + + + + + diff --git a/interface-definitions/include/accel-name-server.xml.in b/interface-definitions/include/accel-name-server.xml.in deleted file mode 100644 index 82ed6771d..000000000 --- a/interface-definitions/include/accel-name-server.xml.in +++ /dev/null @@ -1,18 +0,0 @@ - - - Domain Name Server (DNS) propagated to client - - ipv4 - Domain Name Server (DNS) IPv4 address - - - ipv6 - Domain Name Server (DNS) IPv6 address - - - - - - - - diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i new file mode 100644 index 000000000..e37b68514 --- /dev/null +++ b/interface-definitions/include/accel-radius-additions.xml.i @@ -0,0 +1,125 @@ + + + + + + + Accounting port + + 1-65535 + Numeric IP port (default: 1813) + + + + + + + + + Mark server unavailable for <n> seconds on failure + + 0-600 + Fail time penalty + + + + + Fail time must be between 0 and 600 seconds + + + + + + + Timeout in seconds to wait response from RADIUS server + + 1-60 + Timeout in seconds + + + + + Timeout must be between 1 and 60 seconds + + + + + Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds) + + 0-60 + Timeout in seconds, 0 to keep active + + + + + Timeout must be between 0 and 60 seconds + + + + + Number of tries to send Access-Request/Accounting-Request queries + + 1-20 + Maximum tries + + + + + Maximum tries must be between 1 and 20 + + + + + NAS-Identifier attribute sent to RADIUS + + + + + NAS-IP-Address attribute sent to RADIUS + + + + + ipv4 + NAS-IP-Address attribute + + + + + + Dynamic Authorization Extension/Change of Authorization server + + + + + IP address for Dynamic Authorization Extension server (DM/CoA) + + + + + ipv4 + IPv4 address for aynamic authorization server + + + + + + Port for Dynamic Authorization Extension server (DM/CoA) + + number + TCP port + + + + + + + + + Shared secret for Dynamic Authorization Extension server + + + + + + diff --git a/interface-definitions/include/accel-radius-additions.xml.in b/interface-definitions/include/accel-radius-additions.xml.in deleted file mode 100644 index e37b68514..000000000 --- a/interface-definitions/include/accel-radius-additions.xml.in +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - Accounting port - - 1-65535 - Numeric IP port (default: 1813) - - - - - - - - - Mark server unavailable for <n> seconds on failure - - 0-600 - Fail time penalty - - - - - Fail time must be between 0 and 600 seconds - - - - - - - Timeout in seconds to wait response from RADIUS server - - 1-60 - Timeout in seconds - - - - - Timeout must be between 1 and 60 seconds - - - - - Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds) - - 0-60 - Timeout in seconds, 0 to keep active - - - - - Timeout must be between 0 and 60 seconds - - - - - Number of tries to send Access-Request/Accounting-Request queries - - 1-20 - Maximum tries - - - - - Maximum tries must be between 1 and 20 - - - - - NAS-Identifier attribute sent to RADIUS - - - - - NAS-IP-Address attribute sent to RADIUS - - - - - ipv4 - NAS-IP-Address attribute - - - - - - Dynamic Authorization Extension/Change of Authorization server - - - - - IP address for Dynamic Authorization Extension server (DM/CoA) - - - - - ipv4 - IPv4 address for aynamic authorization server - - - - - - Port for Dynamic Authorization Extension server (DM/CoA) - - number - TCP port - - - - - - - - - Shared secret for Dynamic Authorization Extension server - - - - - - diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in index 9ee5d5156..ee09d01d6 100644 --- a/interface-definitions/service_ipoe-server.xml.in +++ b/interface-definitions/service_ipoe-server.xml.in @@ -111,8 +111,8 @@ - #include - #include + #include + #include Client authentication methods @@ -198,7 +198,7 @@ #include - #include + #include diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 605f47b37..64fd6e4ef 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -109,7 +109,7 @@ #include #include - #include + #include @@ -200,8 +200,8 @@ - #include - #include + #include + #include interface(s) to listen on diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 702ef8b5a..4de28d2bd 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -36,7 +36,7 @@ - #include + #include L2TP Network Server (LNS) @@ -203,7 +203,7 @@ - #include + #include Description for L2TP remote-access settings diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in index 032455b4d..f37c9bd01 100644 --- a/interface-definitions/vpn_pptp.xml.in +++ b/interface-definitions/vpn_pptp.xml.in @@ -153,7 +153,7 @@ #include - #include + #include diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index f0c93b882..5da2f8f24 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -96,7 +96,7 @@ #include - #include + #include @@ -207,8 +207,8 @@ - #include - #include + #include + #include #include -- cgit v1.2.3