diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-05-15 20:58:58 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-05-15 20:58:58 +0200 |
| commit | d34591809104df052d2706edec3ee3f8428cf55e (patch) | |
| tree | 4d4f33ef02605bbfea8d7b09feec0c0b9c8d997a /interface-definitions | |
| parent | 86771ef232f45058f8cf8c5848ef2e805afadd1b (diff) | |
| parent | 30030cc0cc808b9a1c942e89e8698ee2b522b87f (diff) | |
| download | vyos-1x-d34591809104df052d2706edec3ee3f8428cf55e.tar.gz vyos-1x-d34591809104df052d2706edec3ee3f8428cf55e.zip | |
Merge remote-tracking branch 'upstream/current' into current
* upstream/current:
Do not try to decode data read from /sys files in the show version script, it's already an str.
Dependencies on file and pystache, for install and show version scripts..
Add dependency on hvinfo, too.
T637, T638: add dependencies on tcpdump and bmon.
T638: new op mode CLI for the bandwidth monitor commands.
T637: new op mode for traffic dumps based on tcpdump.
Correct the logic of generating tag nodes for op mode.
Add missing vyos.base module
Fix cron interval regex to allow single digit values.
Fix misplaces ConfigError exception.
Some more valueless fixes.
Mark nodes in SSH and NTP valueless (related to T602).
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/cron.xml | 2 | ||||
| -rw-r--r-- | interface-definitions/dns-forwarding.xml | 2 | ||||
| -rw-r--r-- | interface-definitions/ntp.xml | 4 | ||||
| -rw-r--r-- | interface-definitions/ssh.xml | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/interface-definitions/cron.xml b/interface-definitions/cron.xml index 8e4c1294a..65b95c5a4 100644 --- a/interface-definitions/cron.xml +++ b/interface-definitions/cron.xml @@ -45,7 +45,7 @@ <description>Execution interval in days</description> </valueHelp> <constraint> - <regex>[1-9]([0-9]+)([mhd]{0,1})</regex> + <regex>[1-9]([0-9]*)([mhd]{0,1})</regex> </constraint> </properties> </leafNode> diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml index 81aa6063d..60b90c6a7 100644 --- a/interface-definitions/dns-forwarding.xml +++ b/interface-definitions/dns-forwarding.xml @@ -62,6 +62,7 @@ <leafNode name="ignore-hosts-file"> <properties> <help>Do not use local /etc/hosts file in name resolution</help> + <valueless/> </properties> </leafNode> <leafNode name="listen-on"> @@ -94,6 +95,7 @@ <leafNode name="system"> <properties> <help>DNS forwarding to system nameservers</help> + <valueless/> </properties> </leafNode> </children> diff --git a/interface-definitions/ntp.xml b/interface-definitions/ntp.xml index c6fd8aa14..d9930a262 100644 --- a/interface-definitions/ntp.xml +++ b/interface-definitions/ntp.xml @@ -19,21 +19,25 @@ <leafNode name="dynamic"> <properties> <help>Allow server to be configured even if not reachable</help> + <valueless/> </properties> </leafNode> <leafNode name="noselect"> <properties> <help>Marks the server as unused</help> + <valueless/> </properties> </leafNode> <leafNode name="preempt"> <properties> <help>Specifies the association as preemptable rather than the default persistent</help> + <valueless/> </properties> </leafNode> <leafNode name="prefer"> <properties> <help>Marks the server as preferred</help> + <valueless/> </properties> </leafNode> </children> diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml index f898f3934..ba5b887bc 100644 --- a/interface-definitions/ssh.xml +++ b/interface-definitions/ssh.xml @@ -41,6 +41,7 @@ <leafNode name="allow-root"> <properties> <help>Enable root login over ssh</help> + <valueless/> </properties> </leafNode> <leafNode name="ciphers"> @@ -54,11 +55,13 @@ <leafNode name="disable-host-validation"> <properties> <help>Don't validate the remote host name with DNS</help> + <valueless/> </properties> </leafNode> <leafNode name="disable-password-authentication"> <properties> <help>Don't allow unknown user to login with password</help> + <valueless/> </properties> </leafNode> <leafNode name="key-exchange"> |