summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/404.rst3
m---------docs/_include/vyos-1x0
-rw-r--r--docs/_templates/layout.html2
-rw-r--r--docs/automation/command-scripting.rst2
-rw-r--r--docs/changelog/1.3.rst12
-rw-r--r--docs/changelog/1.4.rst35
-rw-r--r--docs/changelog/1.5.rst33
-rw-r--r--docs/conf.py6
-rw-r--r--docs/configexamples/ha.rst2
-rw-r--r--docs/configexamples/policy-based-ipsec-and-firewall.rst4
-rw-r--r--docs/configuration/highavailability/index.rst2
-rw-r--r--docs/configuration/nat/nat44.rst2
-rw-r--r--docs/configuration/vpn/l2tp.rst2
-rw-r--r--docs/configuration/vpn/site2site_ipsec.rst4
-rw-r--r--docs/configuration/vrf/index.rst4
-rw-r--r--docs/quick-start.rst2
16 files changed, 98 insertions, 17 deletions
diff --git a/docs/404.rst b/docs/404.rst
index 5073773a..2ae79f2e 100644
--- a/docs/404.rst
+++ b/docs/404.rst
@@ -8,4 +8,5 @@ Try using the search box or go to the release homepage:
* `1.2.x (crux) <https://docs.vyos.io/en/crux/>`_
* `1.3.x (equuleus) <https://docs.vyos.io/en/equuleus/>`_
- * `rolling release (sagitta) <https://docs.vyos.io/en/latest/>`_
+ * `1.4.x (sagitta) <https://docs.vyos.io/en/sagitta/>`_
+ * `rolling release (circinus) <https://docs.vyos.io/en/latest/>`_
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject fd9e2c24e739fd327f860c45fa00241fd1acca7
+Subproject 9f92b9ff69477fa93a87f49666a1f7b79949d58
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index e7ede58c..6cb68508 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -1,5 +1,5 @@
{% extends "!layout.html" %}
-{%- set current_version = "1.4.x sagitta" %}
+{%- set current_version = "1.5.x circinus" %}
{% block extrahead %}
<link href="{{ pathto("_static/css/custom.css", True) }}" rel="stylesheet" type="text/css">
<link href="{{ pathto("_static/css/datatables.css", True) }}" rel="stylesheet" type="text/css">
diff --git a/docs/automation/command-scripting.rst b/docs/automation/command-scripting.rst
index 64564e5a..c8a72a36 100644
--- a/docs/automation/command-scripting.rst
+++ b/docs/automation/command-scripting.rst
@@ -94,7 +94,7 @@ Here is a simple example:
#!/bin/vbash
source /opt/vyatta/etc/functions/script-template
configure
- source < /config/scripts/setfirewallgroup.py
+ source <(/config/scripts/setfirewallgroup.py)
commit
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index c5192eab..a5fafa98 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
_ext/releasenotes.py
+2023-11-07
+==========
+
+* :vytask:`T5586` ``(feature): Disable by default SNMP for Keepalived VRRP``
+
+
+2023-11-06
+==========
+
+* :vytask:`T4269` ``(feature): node.def generator should automatically add default values``
+
+
2023-10-26
==========
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 86b201df..9210e40f 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,41 @@
_ext/releasenotes.py
+2023-11-10
+==========
+
+* :vytask:`T5727` ``(bug): validator: Use native URL validator instead of regex-based validator``
+
+
+2023-11-08
+==========
+
+* :vytask:`T5720` ``(bug): PPPoE-server adding new interface does not work``
+* :vytask:`T5716` ``(bug): PPPoE-server shaper template bug down-limiter option does not rely on fwmark``
+* :vytask:`T5702` ``(feature): Add ability to set include_ifmib_iface_prefix and ifmib_max_num_ifaces for SNMP``
+* :vytask:`T5648` ``(bug): ldpd neighbour template errors``
+* :vytask:`T5564` ``(bug): Both show firewall group and show firewall summary fails``
+* :vytask:`T5559` ``(feature): Selective proxy-arp/proxy-ndp when doing SNAT/DNAT``
+* :vytask:`T5541` ``(bug): Zone-Based Firewalling in VyOS Sagitta 1.4``
+* :vytask:`T5513` ``(bug): Anomalies in show firewall command after refactoring``
+* :vytask:`T4864` ``(bug): `show firewall` command errors``
+
+
+2023-11-07
+==========
+
+* :vytask:`T5586` ``(feature): Disable by default SNMP for Keepalived VRRP``
+
+
+2023-11-06
+==========
+
+* :vytask:`T5705` ``(bug): rsyslog - Not working when using facility=all``
+* :vytask:`T5704` ``(feature): PPPoE-server add max-starting option``
+* :vytask:`T5707` ``(bug): Wireguard peer public key update leaves redundant peers and breaks connectivity``
+* :vytask:`T4269` ``(feature): node.def generator should automatically add default values``
+
+
2023-11-05
==========
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 3cb54a85..5d550447 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,39 @@
_ext/releasenotes.py
+2023-11-10
+==========
+
+* :vytask:`T5727` ``(bug): validator: Use native URL validator instead of regex-based validator``
+
+
+2023-11-08
+==========
+
+* :vytask:`T5720` ``(bug): PPPoE-server adding new interface does not work``
+* :vytask:`T5716` ``(bug): PPPoE-server shaper template bug down-limiter option does not rely on fwmark``
+* :vytask:`T5702` ``(feature): Add ability to set include_ifmib_iface_prefix and ifmib_max_num_ifaces for SNMP``
+* :vytask:`T5693` ``(feature): Adding variable vyos_persistence_dir (and improve variable vyos_rootfs_dir)``
+* :vytask:`T5648` ``(bug): ldpd neighbour template errors``
+* :vytask:`T5564` ``(bug): Both show firewall group and show firewall summary fails``
+* :vytask:`T5559` ``(feature): Selective proxy-arp/proxy-ndp when doing SNAT/DNAT``
+* :vytask:`T5541` ``(bug): Zone-Based Firewalling in VyOS Sagitta 1.4``
+
+
+2023-11-07
+==========
+
+* :vytask:`T5586` ``(feature): Disable by default SNMP for Keepalived VRRP``
+
+
+2023-11-06
+==========
+
+* :vytask:`T5705` ``(bug): rsyslog - Not working when using facility=all``
+* :vytask:`T5704` ``(feature): PPPoE-server add max-starting option``
+* :vytask:`T5707` ``(bug): Wireguard peer public key update leaves redundant peers and breaks connectivity``
+
+
2023-11-03
==========
diff --git a/docs/conf.py b/docs/conf.py
index 4807472e..3fe1c6e1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,14 +22,14 @@ from docutils.parsers.rst.roles import set_classes
# -- Project information -----------------------------------------------------
project = u'VyOS'
-copyright = u'2021, VyOS maintainers and contributors'
+copyright = u'2023, VyOS maintainers and contributors'
author = u'VyOS maintainers and contributors'
# The short X.Y version
-version = u'1.4'
+version = u'1.5'
# The full version, including alpha/beta/rc tags
-release = u'1.4.x (sagitta)'
+release = u'1.5.x (circinus)'
# -- General configuration ---------------------------------------------------
diff --git a/docs/configexamples/ha.rst b/docs/configexamples/ha.rst
index 1ceda8e9..1badf231 100644
--- a/docs/configexamples/ha.rst
+++ b/docs/configexamples/ha.rst
@@ -303,7 +303,7 @@ public interface.
.. code-block:: none
set nat source rule 10 destination address '!192.0.2.0/24'
- set nat source rule 10 outbound-interface 'eth0.50'
+ set nat source rule 10 outbound-interface name 'eth0.50'
set nat source rule 10 source address '10.200.201.0/24'
set nat source rule 10 translation address '203.0.113.1'
diff --git a/docs/configexamples/policy-based-ipsec-and-firewall.rst b/docs/configexamples/policy-based-ipsec-and-firewall.rst
index 1f969453..9b7ba73a 100644
--- a/docs/configexamples/policy-based-ipsec-and-firewall.rst
+++ b/docs/configexamples/policy-based-ipsec-and-firewall.rst
@@ -194,9 +194,9 @@ And NAT Configuration:
set nat source rule 10 destination group network-group 'REMOTE-NETS'
set nat source rule 10 exclude
- set nat source rule 10 outbound-interface 'eth0'
+ set nat source rule 10 outbound-interface name 'eth0'
set nat source rule 10 source group network-group 'LOCAL-NETS'
- set nat source rule 20 outbound-interface 'eth0'
+ set nat source rule 20 outbound-interface name 'eth0'
set nat source rule 20 source group network-group 'LOCAL-NETS'
set nat source rule 20 translation address 'masquerade'
diff --git a/docs/configuration/highavailability/index.rst b/docs/configuration/highavailability/index.rst
index 2f20e783..7f06faa8 100644
--- a/docs/configuration/highavailability/index.rst
+++ b/docs/configuration/highavailability/index.rst
@@ -450,7 +450,7 @@ Port "0" is required if multiple ports are used.
set high-availability virtual-server vyos real-server 192.0.2.12 health-check script '/config/scripts/check-real-server-second.sh'
set high-availability virtual-server vyos real-server 192.0.2.12 port '0'
- set nat source rule 100 outbound-interface 'eth0'
+ set nat source rule 100 outbound-interface name 'eth0'
set nat source rule 100 source address '192.0.2.0/24'
set nat source rule 100 translation address 'masquerade'
diff --git a/docs/configuration/nat/nat44.rst b/docs/configuration/nat/nat44.rst
index b42c6cfe..98b230a9 100644
--- a/docs/configuration/nat/nat44.rst
+++ b/docs/configuration/nat/nat44.rst
@@ -663,7 +663,7 @@ We will use source and destination address for hash generation.
.. code-block:: none
- set nat destination rule 10 inbound-interface inbound-interface eth0
+ set nat destination rule 10 inbound-interface name eth0
set nat destination rule 10 protocol tcp
set nat destination rule 10 destination port 80
set nat destination rule 10 load-balance hash source-address
diff --git a/docs/configuration/vpn/l2tp.rst b/docs/configuration/vpn/l2tp.rst
index 6ea1cc7d..26de47b3 100644
--- a/docs/configuration/vpn/l2tp.rst
+++ b/docs/configuration/vpn/l2tp.rst
@@ -60,7 +60,7 @@ To allow VPN-clients access via your external address, a NAT rule is required:
.. code-block:: none
- set nat source rule 110 outbound-interface 'eth0'
+ set nat source rule 110 outbound-interface name 'eth0'
set nat source rule 110 source address '192.168.255.0/24'
set nat source rule 110 translation address masquerade
diff --git a/docs/configuration/vpn/site2site_ipsec.rst b/docs/configuration/vpn/site2site_ipsec.rst
index 2b3403f5..8c0af774 100644
--- a/docs/configuration/vpn/site2site_ipsec.rst
+++ b/docs/configuration/vpn/site2site_ipsec.rst
@@ -245,13 +245,13 @@ If there is SNAT rules on eth1, need to add exclude rule
# server side
set nat source rule 10 destination address '10.0.0.0/24'
set nat source rule 10 'exclude'
- set nat source rule 10 outbound-interface 'eth1'
+ set nat source rule 10 outbound-interface name 'eth1'
set nat source rule 10 source address '192.168.0.0/24'
# remote office side
set nat source rule 10 destination address '192.168.0.0/24'
set nat source rule 10 'exclude'
- set nat source rule 10 outbound-interface 'eth1'
+ set nat source rule 10 outbound-interface name 'eth1'
set nat source rule 10 source address '10.0.0.0/24'
To allow traffic to pass through to clients, you need to add the following
diff --git a/docs/configuration/vrf/index.rst b/docs/configuration/vrf/index.rst
index dea53321..7a50bfb2 100644
--- a/docs/configuration/vrf/index.rst
+++ b/docs/configuration/vrf/index.rst
@@ -295,11 +295,11 @@ Configuration
set nat destination rule 110 description 'NAT ssh- INSIDE'
set nat destination rule 110 destination port '2022'
- set nat destination rule 110 inbound-interface 'eth0'
+ set nat destination rule 110 inbound-interface name 'eth0'
set nat destination rule 110 protocol 'tcp'
set nat destination rule 110 translation address '192.168.130.40'
- set nat source rule 100 outbound-interface 'eth0'
+ set nat source rule 100 outbound-interface name 'eth0'
set nat source rule 100 protocol 'all'
set nat source rule 100 source address '192.168.130.0/24'
set nat source rule 100 translation address 'masquerade'
diff --git a/docs/quick-start.rst b/docs/quick-start.rst
index 6ae70e9f..d20a39f9 100644
--- a/docs/quick-start.rst
+++ b/docs/quick-start.rst
@@ -114,7 +114,7 @@ network via IP masquerade.
.. code-block:: none
- set nat source rule 100 outbound-interface 'eth0'
+ set nat source rule 100 outbound-interface name 'eth0'
set nat source rule 100 source address '192.168.0.0/24'
set nat source rule 100 translation address masquerade
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 04:09:20 +0000