diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-08 17:45:02 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-03-08 17:45:04 +0100 |
| commit | e129d7f0d1ca8c2938283af66cafedb9f5363da1 (patch) | |
| tree | 1abdd391c2bdf9b41073f286d7a9d39163c4c08a | |
| parent | 84cec1938dbb59590df46690bb2f0155850fd8b6 (diff) | |
| download | vyos-1x-e129d7f0d1ca8c2938283af66cafedb9f5363da1.tar.gz vyos-1x-e129d7f0d1ca8c2938283af66cafedb9f5363da1.zip | |
radius: T2110: move timeout back to system-login
... as e.g. wireless interfaces can not have a timeout specified.
| -rw-r--r-- | interface-definitions/include/radius-server.xml.i | 13 | ||||
| -rw-r--r-- | interface-definitions/system-login.xml.in | 21 |
2 files changed, 21 insertions, 13 deletions
diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i index 9d0633801..d1068b0e4 100644 --- a/interface-definitions/include/radius-server.xml.i +++ b/interface-definitions/include/radius-server.xml.i @@ -50,19 +50,6 @@ </constraint> </properties> </leafNode> - <leafNode name="timeout"> - <properties> - <help>Session timeout</help> - <valueHelp> - <format>1-30</format> - <description>Session timeout in seconds (default: 2)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-30"/> - </constraint> - <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage> - </properties> - </leafNode> </children> </tagNode> </children> diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in index 1d217caba..2499a192c 100644 --- a/interface-definitions/system-login.xml.in +++ b/interface-definitions/system-login.xml.in @@ -111,6 +111,27 @@ </children> </tagNode> #include <include/radius-server.xml.i> + <node name="radius"> + <children> + <tagNode name="server"> + <children> + <leafNode name="timeout"> + <properties> + <help>Session timeout</help> + <valueHelp> + <format>1-30</format> + <description>Session timeout in seconds (default: 2)</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-30"/> + </constraint> + <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage> + </properties> + </leafNode> + </children> + </tagNode> + </children> + </node> </children> </node> </children> |