Merge pull request #1448 from vyos/mergify/bp/sagitta/pr-1447

Fix lint issues (backport #1447)

4 files changed, 108 insertions, 65 deletions

diff --git a/docs/configuration/firewall/flowtables.rst b/docs/configuration/firewall/flowtables.rst
index 3a257dfc..37462787 100644
--- a/docs/configuration/firewall/flowtables.rst
+++ b/docs/configuration/firewall/flowtables.rst
@@ -17,7 +17,8 @@ can be done regarding flowtables.
 
 .. cfgcmd:: set firewall flowtables ...
 
-From main structure defined in :doc:`Firewall Overview</configuration/firewall/index>`
+From main structure defined in
+:doc:`Firewall Overview</configuration/firewall/index>`
 in this section you can find detailed information only for the next part
 of the general structure:
 
diff --git a/docs/configuration/firewall/ipv4.rst b/docs/configuration/firewall/ipv4.rst
index 2fe877bb..d425b41f 100644
--- a/docs/configuration/firewall/ipv4.rst
+++ b/docs/configuration/firewall/ipv4.rst
@@ -16,7 +16,8 @@ Configuration commands covered in this section:
 
 .. cfgcmd:: set firewall ipv4 ...
 
-From main structure defined in :doc:`Firewall Overview</configuration/firewall/index>`
+From main structure defined in
+:doc:`Firewall Overview</configuration/firewall/index>`
 in this section you can find detailed information only for the next part
 of the general structure:
 
@@ -956,13 +957,17 @@ Synproxy
 ********
 Synproxy connections
 
-.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999> action synproxy
-.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999> protocol tcp
-.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999> synproxy tcp mss <501-65535>
+.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999>
+   action synproxy
+.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999>
+   protocol tcp
+.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999>
+   synproxy tcp mss <501-65535>
 
     Set TCP-MSS (maximum segment size) for the connection
 
-.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999> synproxy tcp window-scale <1-14>
+.. cfgcmd:: set firewall ipv4 [input | forward] filter rule <1-999999>
+   synproxy tcp window-scale <1-14>
 
     Set the window scale factor for TCP window scaling
 
@@ -1168,8 +1173,8 @@ Show Firewall log
 .. opcmd:: show log firewall ipv4 name <name> rule <rule>
 
    Show the logs of all firewall; show all ipv4 firewall logs; show all logs
-   for particular hook; show all logs for particular hook and priority; show all logs
-   for particular custom chain; show logs for specific Rule-Set.
+   for particular hook; show all logs for particular hook and priority;
+   show all logs for particular custom chain; show logs for specific Rule-Set.
 
 Example Partial Config
 ======================
diff --git a/docs/configuration/firewall/ipv6.rst b/docs/configuration/firewall/ipv6.rst
index 29cbe097..ce8c5ccf 100644
--- a/docs/configuration/firewall/ipv6.rst
+++ b/docs/configuration/firewall/ipv6.rst
@@ -16,7 +16,8 @@ Configuration commands covered in this section:
 
 .. cfgcmd:: set firewall ipv6 ...
 
-From main structure defined in :doc:`Firewall Overview</configuration/firewall/index>`
+From main structure defined in
+:doc:`Firewall Overview</configuration/firewall/index>`
 in this section you can find detailed information only for the next part
 of the general structure:
 
@@ -373,10 +374,12 @@ There are a lot of matching criteria against which the packet can be tested.
    remain valid if the IPv6 prefix changes and the host
    portion of systems IPv6 address is static (for example, with SLAAC or
    `tokenised IPv6 addresses
-   <https://datatracker.ietf.org/doc/id/draft-chown-6man-tokenised-ipv6-identifiers-02.txt>`_)
+   <https://datatracker.ietf.org
+   /doc/id/draft-chown-6man-tokenised-ipv6-identifiers-02.txt>`_)
    
    This functions for both individual addresses and address groups.
 
+   .. stop_vyoslinter
    .. code-block:: none
 
       # Match any IPv6 address with the suffix ::0000:0000:0000:beef
@@ -388,6 +391,8 @@ There are a lot of matching criteria against which the packet can be tested.
       set firewall ipv6 forward filter rule 200 source group address-group WEBSERVERS
       set firewall ipv6 forward filter rule 200 source address-mask ::ffff:ffff:ffff:ffff
 
+   .. start_vyoslinter
+
 .. cfgcmd:: set firewall ipv6 forward filter rule <1-999999>
    source fqdn <fqdn>
 .. cfgcmd:: set firewall ipv6 input filter rule <1-999999>
@@ -941,13 +946,17 @@ Synproxy
 ********
 Synproxy connections
 
-.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999> action synproxy
-.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999> protocol tcp
-.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999> synproxy tcp mss <501-65535>
+.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999>
+   action synproxy
+.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999>
+   protocol tcp
+.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999>
+   synproxy tcp mss <501-65535>
 
     Set TCP-MSS (maximum segment size) for the connection
 
-.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999> synproxy tcp window-scale <1-14>
+.. cfgcmd:: set firewall ipv6 [input | forward] filter rule <1-999999>
+   synproxy tcp window-scale <1-14>
 
     Set the window scale factor for TCP window scaling
 
@@ -1167,8 +1176,8 @@ Show Firewall log
 .. opcmd:: show log firewall ipv6 name <name> rule <rule>
 
    Show the logs of all firewall; show all ipv6 firewall logs; show all logs
-   for particular hook; show all logs for particular hook and priority; show all logs
-   for particular custom chain; show logs for specific Rule-Set.
+   for particular hook; show all logs for particular hook and priority;
+   show all logs for particular custom chain; show logs for specific Rule-Set.
 
 Example Partial Config
 ======================
diff --git a/docs/configuration/service/pppoe-server.rst b/docs/configuration/service/pppoe-server.rst
index d9a16036..6d818c70 100644
--- a/docs/configuration/service/pppoe-server.rst
+++ b/docs/configuration/service/pppoe-server.rst
@@ -48,7 +48,8 @@ Configuring PPPoE Server
   Create `<user>` for local authentication on this system. The users password
   will be set to `<pass>`.
 
-.. cfgcmd:: set service pppoe-server client-ip-pool <POOL-NAME> range <x.x.x.x-x.x.x.x | x.x.x.x/x>
+.. cfgcmd:: set service pppoe-server client-ip-pool <POOL-NAME>
+   range <x.x.x.x-x.x.x.x | x.x.x.x/x>
 
    Use this command to define the first IP address of a pool of
    addresses to be given to pppoe clients. If notation ``x.x.x.x-x.x.x.x``,
@@ -84,7 +85,8 @@ accounts again.
 
   set service pppoe-server authentication mode radius
 
-.. cfgcmd:: set service pppoe-server authentication radius server <server> key <secret>
+.. cfgcmd:: set service pppoe-server authentication radius
+   server <server> key <secret>
 
   Configure RADIUS `<server>` and its required shared `<secret>` for
   communicating with the RADIUS server.
@@ -108,7 +110,8 @@ If you are using OSPF as IGP, always the closest interface connected to the
 RADIUS server is used. With VyOS 1.2 you can bind all outgoing RADIUS requests
 to a single source IP e.g. the loopback interface.
 
-.. cfgcmd:: set service pppoe-server authentication radius source-address <address>
+.. cfgcmd:: set service pppoe-server authentication radius
+   source-address <address>
 
   Source IPv4 address used in all RADIUS server queires.
 
@@ -118,57 +121,70 @@ to a single source IP e.g. the loopback interface.
 RADIUS advanced options
 =======================
 
-.. cfgcmd:: set service pppoe-server authentication radius server <server> port <port>
+.. cfgcmd:: set service pppoe-server authentication radius
+   server <server> port <port>
 
   Configure RADIUS `<server>` and its required port for authentication requests.
 
-.. cfgcmd:: set service pppoe-server authentication radius server <server> fail-time <time>
+.. cfgcmd:: set service pppoe-server authentication radius
+   server <server> fail-time <time>
 
   Mark RADIUS server as offline for this given `<time>` in seconds.
 
-.. cfgcmd:: set service pppoe-server authentication radius server <server> disable
+.. cfgcmd:: set service pppoe-server authentication radius
+   server <server> disable
 
   Temporary disable this RADIUS server.
 
-.. cfgcmd:: set service pppoe-server authentication radius acct-timeout <timeout>
+.. cfgcmd:: set service pppoe-server authentication radius
+   acct-timeout <timeout>
 
   Timeout to wait reply for Interim-Update packets. (default 3 seconds)
 
-.. cfgcmd:: set service pppoe-server authentication radius dynamic-author server <address>
+.. cfgcmd:: set service pppoe-server authentication radius
+   dynamic-author server <address>
 
   Specifies IP address for Dynamic Authorization Extension server (DM/CoA)
 
-.. cfgcmd:: set service pppoe-server authentication radius dynamic-author port <port>
+.. cfgcmd:: set service pppoe-server authentication radius
+   dynamic-author port <port>
 
   Port for Dynamic Authorization Extension server (DM/CoA)
 
-.. cfgcmd:: set service pppoe-server authentication radius dynamic-author key <secret>
+.. cfgcmd:: set service pppoe-server authentication radius dynamic-author
+   key <secret>
 
   Secret for Dynamic Authorization Extension server (DM/CoA)
 
-.. cfgcmd:: set service pppoe-server authentication radius max-try <number>
+.. cfgcmd:: set service pppoe-server authentication radius
+   max-try <number>
 
   Maximum number of tries to send Access-Request/Accounting-Request queries
 
-.. cfgcmd:: set service pppoe-server authentication radius timeout <timeout>
+.. cfgcmd:: set service pppoe-server authentication radius
+   timeout <timeout>
 
   Timeout to wait response from server (seconds)
 
-.. cfgcmd:: set service pppoe-server authentication radius nas-identifier <identifier>
+.. cfgcmd:: set service pppoe-server authentication radius
+   nas-identifier <identifier>
 
   Value to send to RADIUS server in NAS-Identifier attribute and to be matched
   in DM/CoA requests.
 
-.. cfgcmd:: set service pppoe-server authentication radius nas-ip-address <address>
+.. cfgcmd:: set service pppoe-server authentication radius
+   nas-ip-address <address>
 
   Value to send to RADIUS server in NAS-IP-Address attribute and to be matched
   in DM/CoA requests. Also DM/CoA server will bind to that address.
 
-.. cfgcmd:: set service pppoe-server authentication radius source-address <address>
+.. cfgcmd:: set service pppoe-server authentication radius
+   source-address <address>
 
   Source IPv4 address used in all RADIUS server queires.
 
-.. cfgcmd:: set service pppoe-server authentication radius rate-limit attribute <attribute>
+.. cfgcmd:: set service pppoe-server authentication radius
+   rate-limit attribute <attribute>
 
   Specifies which RADIUS server attribute contains the rate limit information.
   The default attribute is ``Filter-Id``.
@@ -176,11 +192,13 @@ RADIUS advanced options
 .. note:: If you set a custom RADIUS attribute you must define it on both
    dictionaries at RADIUS server and client.
 
-.. cfgcmd:: set service pppoe-server authentication radius rate-limit enable
+.. cfgcmd:: set service pppoe-server authentication radius
+   rate-limit enable
 
   Enables bandwidth shaping via RADIUS.
 
-.. cfgcmd:: set service pppoe-server authentication radius rate-limit vendor
+.. cfgcmd:: set service pppoe-server authentication radius
+   rate-limit vendor
 
   Specifies the vendor dictionary, dictionary needs to be in
   /usr/share/accel-ppp/radius.
@@ -192,25 +210,27 @@ Allocation clients ip addresses by RADIUS
 =========================================
 
 If the RADIUS server sends the attribute ``Framed-IP-Address`` then this IP
-address will be allocated to the client and the option ``default-pool`` within the CLI
-config is being ignored.
+address will be allocated to the client and the option ``default-pool``
+within the CLI config is being ignored.
 
-If the RADIUS server sends the attribute ``Framed-Pool``, IP address will be allocated
-from a predefined IP pool whose name equals the attribute value.
+If the RADIUS server sends the attribute ``Framed-Pool``, IP address will
+be allocated from a predefined IP pool whose name equals the attribute value.
 
-If the RADIUS server sends the attribute ``Stateful-IPv6-Address-Pool``, IPv6 address
-will be allocated from a predefined IPv6 pool ``prefix`` whose name equals the attribute value.
+If the RADIUS server sends the attribute ``Stateful-IPv6-Address-Pool``,
+IPv6 address will be allocated from a predefined IPv6 pool ``prefix``
+whose name equals the attribute value.
 
-If the RADIUS server sends the attribute ``Delegated-IPv6-Prefix-Pool``, IPv6
-delegation pefix will be allocated from a predefined IPv6 pool ``delegate``
+If the RADIUS server sends the attribute ``Delegated-IPv6-Prefix-Pool``,
+IPv6 delegation pefix will be allocated from a predefined IPv6 pool ``delegate``
 whose name equals the attribute value.
 
-.. note:: ``Stateful-IPv6-Address-Pool`` and ``Delegated-IPv6-Prefix-Pool`` are defined in
-          RFC6911. If they are not defined in your RADIUS server, add new dictionary_.
+.. note:: ``Stateful-IPv6-Address-Pool`` and ``Delegated-IPv6-Prefix-Pool``
+          are defined in RFC6911. If they are not defined in your RADIUS server,
+          add new dictionary_.
 
-User interface can be put to VRF context via RADIUS Access-Accept packet, or change
-it via RADIUS CoA. ``Accel-VRF-Name`` is used from these purposes. It is custom `ACCEL-PPP attribute`_.
-Define it in your RADIUS server.
+User interface can be put to VRF context via RADIUS Access-Accept packet,
+or change it via RADIUS CoA. ``Accel-VRF-Name`` is used from these purposes.
+It is custom `ACCEL-PPP attribute`_. Define it in your RADIUS server.
 
 Renaming clients interfaces by RADIUS
 =====================================
@@ -255,13 +275,13 @@ attributes.
 For Local Users
 ===============
 
-.. cfgcmd:: set service pppoe-server authentication local-users username <user> rate-limit
-   download <bandwidth>
+.. cfgcmd:: set service pppoe-server authentication local-users username
+   <user> rate-limit download <bandwidth>
 
   Download bandwidth limit in kbit/s for `<user>`.
 
-.. cfgcmd:: set service pppoe-server authentication local-users username <user> rate-limit
-   upload <bandwidth>
+.. cfgcmd:: set service pppoe-server authentication local-users username
+   <user> rate-limit upload <bandwidth>
 
   Upload bandwidth limit in kbit/s for `<user>`.
 
@@ -339,7 +359,8 @@ other servers. Last command says that this PPPoE server can serve only
 IPv6
 ****
 
-.. cfgcmd:: set service pppoe-server ppp-options ipv6 <require | prefer | allow | deny>
+.. cfgcmd:: set service pppoe-server ppp-options
+   ipv6 <require | prefer | allow | deny>
 
   Specifies IPv6 negotiation preference.
 
@@ -348,16 +369,16 @@ IPv6
   * **allow** - Negotiate IPv6 only if client requests
   * **deny** - Do not negotiate IPv6 (default value)
 
-.. cfgcmd:: set service pppoe-server client-ipv6-pool <IPv6-POOL-NAME> prefix <address>
-   mask <number-of-bits>
+.. cfgcmd:: set service pppoe-server client-ipv6-pool <IPv6-POOL-NAME>
+   prefix <address> mask <number-of-bits>
 
   Use this comand to set the IPv6 address pool from which an PPPoE client
   will get an IPv6 prefix of your defined length (mask) to terminate the
   PPPoE endpoint at their side. The mask length can be set from 48 to 128
   bit long, the default value is 64.
 
-.. cfgcmd:: set service pppoe-server client-ipv6-pool <IPv6-POOL-NAME> delegate <address>
-   delegation-prefix <number-of-bits>
+.. cfgcmd:: set service pppoe-server client-ipv6-pool <IPv6-POOL-NAME>
+   delegate <address> delegation-prefix <number-of-bits>
 
   Use this command to configure DHCPv6 Prefix Delegation (RFC3633) on
   PPPoE. You will have to set your IPv6 pool and the length of the
@@ -382,7 +403,8 @@ IPv6 Advanced Options
 
   Accept peer interface identifier. By default is not defined.
 
-.. cfgcmd:: set service pppoe-server ppp-options ipv6-interface-id <random | x:x:x:x>
+.. cfgcmd:: set service pppoe-server ppp-options ipv6-interface-id
+   <random | x:x:x:x>
 
   Specifies fixed or random interface identifier for IPv6.
   By default is fixed.
@@ -390,7 +412,8 @@ IPv6 Advanced Options
   * **random** - Random interface identifier for IPv6
   * **x:x:x:x** - Specify interface identifier for IPv6
 
-.. cfgcmd:: set service pppoe-server ppp-options ipv6-interface-id <random | x:x:x:x>
+.. cfgcmd:: set service pppoe-server ppp-options ipv6-interface-id
+   <random | x:x:x:x>
 
   Specifies peer interface identifier for IPv6. By default is fixed.
 
@@ -426,12 +449,13 @@ Advanced Options
 Authentication Advanced Options
 ===============================
 
-.. cfgcmd:: set service pppoe-server authentication local-users username <user> disable
+.. cfgcmd:: set service pppoe-server authentication local-users
+   username <user> disable
 
   Disable `<user>` account.
 
-.. cfgcmd:: set service pppoe-server authentication local-users username <user> static-ip
-   <address>
+.. cfgcmd:: set service pppoe-server authentication local-users
+   username <user> static-ip <address>
 
   Assign static IP address to `<user>` account.
 
@@ -444,7 +468,8 @@ Authentication Advanced Options
 Client IP Pool Advanced Options
 ===============================
 
-.. cfgcmd:: set service pppoe-server client-ip-pool <POOL-NAME> next-pool <NEXT-POOL-NAME>
+.. cfgcmd:: set service pppoe-server client-ip-pool <POOL-NAME>
+   next-pool <NEXT-POOL-NAME>
 
    Use this command to define the next address pool name.
 
@@ -464,7 +489,8 @@ PPP Advanced Options
   This should reduce kernel-level interface creation/deletion rate lack.
   Default value is **0**.
 
-.. cfgcmd:: set service pppoe-server ppp-options ipv4 <require | prefer | allow | deny>
+.. cfgcmd:: set service pppoe-server ppp-options ipv4
+   <require | prefer | allow | deny>
 
   Specifies IPv4 negotiation preference.
 
@@ -652,5 +678,7 @@ a /56 subnet for the clients internal use.
    ppp0   | test     | 192.168.0.1 | 2001:db8:8002:0:200::/64 | 2001:db8:8003::1/56 | 00:53:00:12:42:eb |            | active | 00:00:49 | 875 B    | 2.1 KiB
 
 .. include:: /_include/common-references.txt
-.. _dictionary: https://github.com/accel-ppp/accel-ppp/blob/master/accel-pppd/radius/dict/dictionary.rfc6911
-.. _`ACCEL-PPP attribute`: https://github.com/accel-ppp/accel-ppp/blob/master/accel-pppd/radius/dict/dictionary.accel
\ No newline at end of file
+.. _dictionary: https://github.com/accel-ppp/accel-ppp/blob/master/
+   accel-pppd/radius/dict/dictionary.rfc6911
+.. _`ACCEL-PPP attribute`: https://github.com/accel-ppp/accel-ppp/
+   blob/master/accel-pppd/radius/dict/dictionary.accel
\ No newline at end of file