diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-18 21:07:07 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:44:02 +0100 |
| commit | dfa2f0e8ecd8a117bf47b64d7099d613f487d799 (patch) | |
| tree | 2a4151ea45a833abcc2854f313aed41bb19c38be /interface-definitions | |
| parent | e6b269980faaaa2b3529cdb34e8f83c9f3c41b64 (diff) | |
| download | vyos-1x-dfa2f0e8ecd8a117bf47b64d7099d613f487d799.tar.gz vyos-1x-dfa2f0e8ecd8a117bf47b64d7099d613f487d799.zip | |
wireless: T1627: change RADIUS CLI syntax
Adopt RADIUS configuration and harmonize it with the rest of VyOS. Move the
following configuration block:
security {
wpa {
cipher CCMP
mode wpa2
radius-server 172.16.100.10 {
port 1812
secret secretkey
}
radius-server 172.16.100.11 {
port 1812
secret secretkey
}
}
}
to the harmonized version of:
security {
wpa {
cipher CCMP
mode wpa2
radius {
server 172.16.100.10 {
port 1812
secret secretkey
}
server 172.16.100.11 {
port 1812
secret secretkey
}
}
}
}
And add the new "set interfaces wireless wlan0 security wpa radius
source-address" CLI command to specify the origin of any RADIUS query on
systems having multiple IP addresses.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-wireless.xml | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/interface-definitions/interfaces-wireless.xml b/interface-definitions/interfaces-wireless.xml index a1712cb33..f1928ee0c 100644 --- a/interface-definitions/interfaces-wireless.xml +++ b/interface-definitions/interfaces-wireless.xml @@ -744,46 +744,47 @@ <constraintErrorMessage>Invalid WPA pass phrase, must be 8 to 63 printable characters!</constraintErrorMessage> </properties> </leafNode> - <tagNode name="radius-server"> + <node name="radius"> <properties> - <help>RADIUS server authentication</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 address of RADIUS server</description> - </valueHelp> + <help>RADIUS specific configuration</help> </properties> <children> - <leafNode name="accounting"> - <properties> - <help>RADIUS server to receive accounting info (default: 1813)</help> - <valueHelp> - <format>1-65535</format> - <description>RADIUS server accounting port</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="port"> + <tagNode name="server"> <properties> - <help>RADIUS server port (default: 1812)</help> + <help>RADIUS server</help> <valueHelp> - <format>1-65535</format> - <description>RADIUS server port</description> + <format>ipv4</format> + <description>IPv4 address of RADIUS server</description> </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="secret"> - <properties> - <help>Secret for radius access</help> </properties> - </leafNode> + <children> + <leafNode name="accounting"> + <properties> + <help>Enable RADIUS server to receive accounting info</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="port"> + <properties> + <help>RADIUS server port (default: 1812)</help> + <valueHelp> + <format>1-65535</format> + <description>RADIUS server port</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + <leafNode name="key"> + <properties> + <help>RADIUS shared secret key</help> + </properties> + </leafNode> + </children> + </tagNode> </children> - </tagNode> + </node> </children> </node> </children> |