diff options
| author | hagbard <vyosdev@derith.de> | 2019-12-16 08:56:46 -0800 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-12-16 08:56:46 -0800 |
| commit | 214e63fbad5f1ed008543ba0eec56d1aa6649745 (patch) | |
| tree | 71f21947a57366cf007206b0b852411ed09afb0e /interface-definitions | |
| parent | d814020778b8310faa3cd57ccfbc718bfb2fe215 (diff) | |
| parent | b55b68f6246329468b4ab3450e127d5bab683bff (diff) | |
| download | vyos-1x-214e63fbad5f1ed008543ba0eec56d1aa6649745.tar.gz vyos-1x-214e63fbad5f1ed008543ba0eec56d1aa6649745.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dns-dynamic.xml.in | 57 | ||||
| -rw-r--r-- | interface-definitions/service-pppoe.xml.in (renamed from interface-definitions/pppoe-server.xml.in) | 22 |
2 files changed, 53 insertions, 26 deletions
diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in index 8e7e77475..725ebadac 100644 --- a/interface-definitions/dns-dynamic.xml.in +++ b/interface-definitions/dns-dynamic.xml.in @@ -78,48 +78,52 @@ </valueHelp> <valueHelp> <format>afraid</format> - <description/> + <description>afraid.org Services</description> </valueHelp> <valueHelp> <format>changeip</format> - <description/> + <description>changeip.com Services</description> </valueHelp> <valueHelp> <format>cloudflare</format> - <description/> + <description>cloudflare.com Services</description> </valueHelp> <valueHelp> <format>dnspark</format> - <description/> + <description>dnspark.com Services</description> </valueHelp> <valueHelp> <format>dslreports</format> - <description/> + <description>dslreports.com Services</description> </valueHelp> <valueHelp> <format>dyndns</format> - <description/> + <description>dyndns.com Services</description> </valueHelp> <valueHelp> <format>easydns</format> - <description/> + <description>easydns.com Services</description> </valueHelp> <valueHelp> <format>namecheap</format> - <description/> + <description>namecheap.com Services</description> </valueHelp> <valueHelp> <format>noip</format> - <description/> + <description>noip.com Services</description> </valueHelp> <valueHelp> <format>sitelutions</format> - <description/> + <description>sitelutions.com Services</description> </valueHelp> <valueHelp> <format>zoneedit</format> - <description/> + <description>zoneedit.com Services</description> </valueHelp> + <constraint> + <regex>(custom|afraid|changeip|cloudflare|dnspark|dslreports|dyndns|easydns|namecheap|noip|sitelutions|zoneedit)</regex> + </constraint> + <constraintErrorMessage>Please choose from the list of allowed services</constraintErrorMessage> </properties> <children> <leafNode name="host-name"> @@ -141,50 +145,53 @@ <leafNode name="protocol"> <properties> <help>ddclient protocol used for DDNS service [REQUIRED FOR CUSTOM]</help> - <valueHelp> - <format>protocol</format> - <description>ddclient protocol</description> - </valueHelp> + <completionHelp> + <list>changeip cloudflare dnspark dslreports1 dyndns2 easydns namecheap noip sitelutions zoneedit1</list> + </completionHelp> <valueHelp> <format>changeip</format> - <description/> + <description>changeip protocol</description> </valueHelp> <valueHelp> <format>cloudflare</format> - <description/> + <description>cloudflare protocol</description> </valueHelp> <valueHelp> <format>dnspark</format> - <description/> + <description>dnspark protocol</description> </valueHelp> <valueHelp> <format>dslreports1</format> - <description/> + <description>dslreports1 protocol</description> </valueHelp> <valueHelp> <format>dyndns2</format> - <description/> + <description>dyndns2 protocol</description> </valueHelp> <valueHelp> <format>easydns</format> - <description/> + <description>easydns protocol</description> </valueHelp> <valueHelp> <format>namecheap</format> - <description/> + <description>namecheap protocol</description> </valueHelp> <valueHelp> <format>noip</format> - <description/> + <description>noip protocol</description> </valueHelp> <valueHelp> <format>sitelutions</format> - <description/> + <description>sitelutions protocol</description> </valueHelp> <valueHelp> <format>zoneedit1</format> - <description/> + <description>zoneedit1 protocol</description> </valueHelp> + <constraint> + <regex>(changeip|cloudflare|dnspark|dslreports1|dyndns2|easydns|namecheap|noip|sitelutions|zoneedit1)</regex> + </constraint> + <constraintErrorMessage>Please choose from the list of allowed protocols</constraintErrorMessage> </properties> </leafNode> <leafNode name="server"> diff --git a/interface-definitions/pppoe-server.xml.in b/interface-definitions/service-pppoe.xml.in index 6e99c2fd7..4951f656b 100644 --- a/interface-definitions/pppoe-server.xml.in +++ b/interface-definitions/service-pppoe.xml.in @@ -2,7 +2,7 @@ <interfaceDefinition> <node name="service"> <children> - <node name="pppoe-server" owner="${vyos_conf_scripts_dir}/accel_pppoe.py"> + <node name="pppoe-server" owner="${vyos_conf_scripts_dir}/service-pppoe.py"> <properties> <help>Point to Point over Ethernet (PPPoE) Server</help> <priority>900</priority> @@ -30,6 +30,26 @@ <constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage> </properties> </leafNode> + <leafNode name="session-control"> + <properties> + <help>control sessions count</help> + <constraint> + <regex>(deny|disable)</regex> + </constraint> + <constraintErrorMessage>Invalid value</constraintErrorMessage> + <valueHelp> + <format>disable</format> + <description>Disables session control</description> + </valueHelp> + <valueHelp> + <format>deny</format> + <description>Deny second session authorization</description> + </valueHelp> + <completionHelp> + <list>deny disable</list> + </completionHelp> + </properties> + </leafNode> <node name="authentication"> <properties> <help>Authentication for remote access PPPoE Server</help> |