diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-07 21:28:04 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-07 23:23:53 +0100 |
| commit | e8a1c291b1d4b90709a68038e16522b4cee82904 (patch) | |
| tree | 46c948c322af6107393609be64f53fa8ff3dbeb2 /interface-definitions | |
| parent | dcdc4f3ea27f1a26f8baa6b72b51c7911f21e6ba (diff) | |
| download | vyos-1x-e8a1c291b1d4b90709a68038e16522b4cee82904.tar.gz vyos-1x-e8a1c291b1d4b90709a68038e16522b4cee82904.zip | |
login: radius: T3192: migrate to get_config_dict()
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/radius-server-ipv4-ipv6.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/system-login.xml.in | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i index e947c09e2..e4919d86a 100644 --- a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i +++ b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i @@ -4,7 +4,6 @@ <help>RADIUS based user authentication</help> </properties> <children> - #include <include/source-address-ipv4-ipv6.xml.i> <tagNode name="server"> <properties> <help>RADIUS server configuration</help> @@ -27,6 +26,7 @@ #include <include/radius-server-port.xml.in> </children> </tagNode> + #include <include/source-address-ipv4-ipv6.xml.i> </children> </node> <!-- included end --> diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in index 6c573bf96..34e14d8e7 100644 --- a/interface-definitions/system-login.xml.in +++ b/interface-definitions/system-login.xml.in @@ -34,6 +34,7 @@ </constraint> <constraintErrorMessage>Invalid encrypted password for $VAR(../../@).</constraintErrorMessage> </properties> + <defaultValue>!</defaultValue> </leafNode> <leafNode name="plaintext-password"> <properties> @@ -44,7 +45,7 @@ <properties> <help>Remote access public keys</help> <valueHelp> - <format>>identifier<</format> + <format>txt</format> <description>Key identifier used by ssh-keygen (usually of form user@host)</description> </valueHelp> </properties> @@ -61,7 +62,7 @@ </leafNode> <leafNode name="type"> <properties> - <help></help> + <help>Public key type</help> <completionHelp> <list>ssh-dss ssh-rsa ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519</list> </completionHelp> @@ -86,7 +87,7 @@ <description/> </valueHelp> <constraint> - <regex>(ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519)</regex> + <regex>^(ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519)$</regex> </constraint> </properties> </leafNode> @@ -119,7 +120,7 @@ <properties> <help>Session timeout</help> <valueHelp> - <format>1-30</format> + <format>u32:1-30</format> <description>Session timeout in seconds (default: 2)</description> </valueHelp> <constraint> @@ -127,18 +128,20 @@ </constraint> <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage> </properties> + <defaultValue>2</defaultValue> </leafNode> <leafNode name="priority"> <properties> <help>Server priority</help> <valueHelp> - <format>1-255</format> + <format>u32:1-255</format> <description>Server priority (default: 255)</description> </valueHelp> <constraint> <validator name="numeric" argument="--range 1-255"/> </constraint> </properties> + <defaultValue>255</defaultValue> </leafNode> </children> </tagNode> |