diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-01 22:20:01 +0100 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 22:20:01 +0100 | 
| commit | b3d9344a7e23fa3ffaa2204ff8e5bc370deb26f7 (patch) | |
| tree | 60e88215d1066cc210d811a4171927cbe1f2324b /docs/interfaces | |
| parent | 1f417f7ba32d1f3a458871f987916545cfc43544 (diff) | |
| parent | 3ba8224c1a7ec265a209d5035a6a1c910bebb7c6 (diff) | |
| download | vyos-documentation-b3d9344a7e23fa3ffaa2204ff8e5bc370deb26f7.tar.gz vyos-documentation-b3d9344a7e23fa3ffaa2204ff8e5bc370deb26f7.zip | |
Merge pull request #157 from rebortg/addresspace
Addresspace
Diffstat (limited to 'docs/interfaces')
| -rw-r--r-- | docs/interfaces/addresses.rst | 2 | ||||
| -rw-r--r-- | docs/interfaces/bridge.rst | 2 | ||||
| -rw-r--r-- | docs/interfaces/ethernet.rst | 2 | ||||
| -rw-r--r-- | docs/interfaces/index.rst | 2 | ||||
| -rw-r--r-- | docs/interfaces/vlan.rst | 2 | ||||
| -rw-r--r-- | docs/interfaces/wireless.rst | 22 | 
6 files changed, 16 insertions, 16 deletions
| diff --git a/docs/interfaces/addresses.rst b/docs/interfaces/addresses.rst index 19ba8225..034fb0ef 100644 --- a/docs/interfaces/addresses.rst +++ b/docs/interfaces/addresses.rst @@ -32,7 +32,7 @@ The command is ``set interfaces $type $name address $address``. Examples:    set interfaces ethernet eth0 address 192.0.2.1/24    set interfaces tunnel tun0 address 10.0.0.1/30    set interfaces bridge br0 address 203.0.113.45/26 -  set interfaces ethernet eth0 vif 30 address 192.0.30.254/24 +  set interfaces ethernet eth0 vif 30 address 198.51.100.254/24  DHCP  **** diff --git a/docs/interfaces/bridge.rst b/docs/interfaces/bridge.rst index 2ae6a243..a7bbbca6 100644 --- a/docs/interfaces/bridge.rst +++ b/docs/interfaces/bridge.rst @@ -109,4 +109,4 @@ The MAC address-table for a bridge can be displayed using the    vyos@vyos:~$ show bridge br100 macs    port no mac addr                is local?       ageing timer -    1     00:0c:29:44:3b:19       yes                0.00 +    1     00:53:29:44:3b:19       yes                0.00 diff --git a/docs/interfaces/ethernet.rst b/docs/interfaces/ethernet.rst index cbefbaf6..a8cee8c2 100644 --- a/docs/interfaces/ethernet.rst +++ b/docs/interfaces/ethernet.rst @@ -23,7 +23,7 @@ Resulting in:        address 2001:db8:1::ffff/64        description INSIDE        duplex auto -      hw-id 00:0c:29:44:3b:19 +      hw-id 00:53:29:44:3b:19        smp_affinity auto        speed auto    } diff --git a/docs/interfaces/index.rst b/docs/interfaces/index.rst index adcc7c71..0513adf1 100644 --- a/docs/interfaces/index.rst +++ b/docs/interfaces/index.rst @@ -25,7 +25,7 @@ command.    vyos@vyos:~$ show interfaces ethernet eth0    eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000 -      link/ether 00:0c:29:44:3b:0f brd ff:ff:ff:ff:ff:ff +      link/ether 00:53:29:44:3b:0f brd ff:ff:ff:ff:ff:ff        inet 172.16.51.129/24 brd 172.16.51.255 scope global eth0        inet6 fe80::20c:29ff:fe44:3b0f/64 scope link           valid_lft forever preferred_lft forever diff --git a/docs/interfaces/vlan.rst b/docs/interfaces/vlan.rst index 82f73efe..55656d5d 100644 --- a/docs/interfaces/vlan.rst +++ b/docs/interfaces/vlan.rst @@ -45,7 +45,7 @@ Resulting in:        address 2001:db8:100::1/64        description INSIDE        duplex auto -      hw-id 00:0c:29:44:3b:19 +      hw-id 00:53:29:44:3b:19        smp_affinity auto        speed auto        vif 100 { diff --git a/docs/interfaces/wireless.rst b/docs/interfaces/wireless.rst index 8bd84364..9e3c6cf5 100644 --- a/docs/interfaces/wireless.rst +++ b/docs/interfaces/wireless.rst @@ -39,7 +39,7 @@ to as :abbr:`SSID (Service Set Identifier)`, and MAC addresses.  The WAP in this example has the following characteristics: -* IP address ``192.0.2.1/24`` +* IP address ``192.168.2.1/24``  * Network ID (SSID) ``TEST``  * WPA passphrase ``12345678``  * Use 802.11n protocol @@ -47,7 +47,7 @@ The WAP in this example has the following characteristics:  .. code-block:: none -  set interfaces wireless wlan0 address '192.0.2.1/24' +  set interfaces wireless wlan0 address '192.168.2.1/24'    set interfaces wireless wlan0 type access-point    set interfaces wireless wlan0 channel 1    set interfaces wireless wlan0 mode n @@ -63,7 +63,7 @@ Resulting in    interfaces {      [...]      wireless wlan0 { -          address 192.0.2.1/24 +          address 192.168.2.1/24            channel 1            mode n            security { @@ -103,24 +103,24 @@ is responsible for authenticating the users.  The WAP in this example has the following characteristics: -* IP address ``192.0.2.1/24`` +* IP address ``192.168.2.1/24``  * Network ID (SSID) ``Enterprise-TEST``  * WPA passphrase ``12345678``  * Use 802.11n protocol  * Wireless channel ``1`` -* RADIUS server at ``192.0.3.10`` with shared-secret ``VyOSPassword`` +* RADIUS server at ``192.168.3.10`` with shared-secret ``VyOSPassword``  .. code-block:: none -  set interfaces wireless wlan0 address '192.0.2.1/24' +  set interfaces wireless wlan0 address '192.168.2.1/24'    set interfaces wireless wlan0 type access-point    set interfaces wireless wlan0 channel 1    set interfaces wireless wlan0 mode n    set interfaces wireless wlan0 ssid 'TEST'    set interfaces wireless wlan0 security wpa mode wpa2    set interfaces wireless wlan0 security wpa cipher CCMP -  set interfaces wireless wlan0 security wpa radius server 192.0.3.10 key 'VyOSPassword' -  set interfaces wireless wlan0 security wpa radius server 192.0.3.10 port 1812 +  set interfaces wireless wlan0 security wpa radius server 192.168.3.10 key 'VyOSPassword' +  set interfaces wireless wlan0 security wpa radius server 192.168.3.10 port 1812  Resulting in @@ -129,7 +129,7 @@ Resulting in    interfaces {      [...]      wireless wlan0 { -          address 192.0.2.1/24 +          address 192.168.2.1/24            channel 1            mode n            security { @@ -137,7 +137,7 @@ Resulting in                    cipher CCMP                    mode wpa2                    radius { -                      server 192.0.3.10 { +                      server 192.168.3.10 {                            key 'VyOSPassword'                            port 1812                        } @@ -263,7 +263,7 @@ The wireless interface identifier can range from wlan0 to wlan999.    Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down    Interface        IP Address                        S/L  Description    ---------        ----------                        ---  ----------- -  wlan0            192.0.2.254/24                    u/u +  wlan0            192.168.2.254/24                    u/u  .. opcmd:: show interfaces wireless <wlanX> queue | 
