fix: the status gives the number of connected OpenVPN clients at most 5 seconds old instead of up to a minute.
Release / release (push) Successful in 22s
Release / release (push) Successful in 22s
This commit is contained in:
1 parent
9255d56276
commit
015fba50ca
5 files changed
+18
-1
No files matched your search
@@ -885,7 +885,7 @@ The status holds the state of `vpn-router-setup`, `slapd` and each PostgreSQL cl
|
|||||||
`vpn-router-manager` when that package is installed, of `strongswan` when site-to-site or
|
`vpn-router-manager` when that package is installed, of `strongswan` when site-to-site or
|
||||||
road-warrior access is configured, of `wg-quick@wg0` when WireGuard is, and of
|
road-warrior access is configured, of `wg-quick@wg0` when WireGuard is, and of
|
||||||
`openvpn-server@vpn-router` when OpenVPN is; the number of connected
|
`openvpn-server@vpn-router` when OpenVPN is; the number of connected
|
||||||
OpenVPN clients, from the server's status file, which OpenVPN rewrites every minute; the package version and,
|
OpenVPN clients, from the server's status file, which OpenVPN rewrites every 5 seconds; the package version and,
|
||||||
as `manager_version`, the installed version of `vpn-router-manager` (`null`, shown as not installed, without it); whether
|
as `manager_version`, the installed version of `vpn-router-manager` (`null`, shown as not installed, without it); whether
|
||||||
Docker is installed, and when it is, the state of `docker.service` and of `vpn-router-docker`
|
Docker is installed, and when it is, the state of `docker.service` and of `vpn-router-docker`
|
||||||
(the Docker rules), which do not change `status`; as `site_to_site`, the number of site-to-site
|
(the Docker rules), which do not change `status`; as `site_to_site`, the number of site-to-site
|
||||||
|
|||||||
@@ -1,3 +1,12 @@
|
|||||||
|
vpn-router (0.24.1-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
fix: the status gives the number of connected OpenVPN clients at most 5 seconds old instead of up to a minute.
|
||||||
|
|
||||||
|
* The OpenVPN server writes its status file every 5 seconds, so a
|
||||||
|
refresh of the status shows clients that connected or left since.
|
||||||
|
|
||||||
|
-- Slawomir Koszewski <slawek@koszewscy.waw.pl> Mon, 02 Nov 2026 23:30:00 +0100
|
||||||
|
|
||||||
vpn-router (0.24.0-1) unstable; urgency=medium
|
vpn-router (0.24.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
feature: /remote-access of the web service shows and changes the settings of IKEv2 road-warrior, OpenVPN and WireGuard access and whether each runs, for the Router Manager's Remote access page.
|
feature: /remote-access of the web service shows and changes the settings of IKEv2 road-warrior, OpenVPN and WireGuard access and whether each runs, for the Router Manager's Remote access page.
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ if str(LIB_DIR) not in sys.path:
|
|||||||
import vpnrouter_ldap
|
import vpnrouter_ldap
|
||||||
import vpnrouter_pki
|
import vpnrouter_pki
|
||||||
import vpnrouter_platforms
|
import vpnrouter_platforms
|
||||||
|
import vpnrouter_status
|
||||||
from vpnrouter_net import DEFAULT_LISTEN, LISTEN_CHOICES, LOOPBACK, ConfigError, detect_interfaces, interface_addresses, ip_output
|
from vpnrouter_net import DEFAULT_LISTEN, LISTEN_CHOICES, LOOPBACK, ConfigError, detect_interfaces, interface_addresses, ip_output
|
||||||
|
|
||||||
CONFIG_FILE = pathlib.Path('/etc/vpn-router/vpn-router.json')
|
CONFIG_FILE = pathlib.Path('/etc/vpn-router/vpn-router.json')
|
||||||
@@ -896,6 +897,8 @@ def build_context(cfg, public_ip=None):
|
|||||||
'openvpn_protocol': _get(cfg, 'openvpn', 'protocol'),
|
'openvpn_protocol': _get(cfg, 'openvpn', 'protocol'),
|
||||||
'openvpn_device': OPENVPN_DEVICE,
|
'openvpn_device': OPENVPN_DEVICE,
|
||||||
'openvpn_ldap_conf': str(OPENVPN_LDAP),
|
'openvpn_ldap_conf': str(OPENVPN_LDAP),
|
||||||
|
'openvpn_status': vpnrouter_status.OPENVPN_STATUS,
|
||||||
|
'openvpn_status_seconds': vpnrouter_status.OPENVPN_STATUS_SECONDS,
|
||||||
'p2s_dns_list': _split_list(_join(local_addrs, _split_list(extras['EXTRA_P2S_DNS']))),
|
'p2s_dns_list': _split_list(_join(local_addrs, _split_list(extras['EXTRA_P2S_DNS']))),
|
||||||
'openvpn_ca': str(vpnrouter_pki.OPENVPN_CA),
|
'openvpn_ca': str(vpnrouter_pki.OPENVPN_CA),
|
||||||
'openvpn_crl': str(vpnrouter_pki.OPENVPN_CRL),
|
'openvpn_crl': str(vpnrouter_pki.OPENVPN_CRL),
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ COMMAND_TIMEOUT = 5
|
|||||||
|
|
||||||
OPENVPN_STATUS = '/run/openvpn-server/status-vpn-router.log'
|
OPENVPN_STATUS = '/run/openvpn-server/status-vpn-router.log'
|
||||||
|
|
||||||
|
#: Seconds between two writes of OPENVPN_STATUS by the OpenVPN server, whose configuration sets it (OpenVPN's default is 60).
|
||||||
|
OPENVPN_STATUS_SECONDS = 5
|
||||||
|
|
||||||
#: Seconds since its last handshake within which a WireGuard peer counts as connected.
|
#: Seconds since its last handshake within which a WireGuard peer counts as connected.
|
||||||
WIREGUARD_CONNECTED_SECONDS = 180
|
WIREGUARD_CONNECTED_SECONDS = 180
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ push "route {{ network }} {{ netmask }}"
|
|||||||
push "dhcp-option DNS {{ address }}"
|
push "dhcp-option DNS {{ address }}"
|
||||||
{% endfor -%}
|
{% endfor -%}
|
||||||
|
|
||||||
|
status {{ openvpn_status }} {{ openvpn_status_seconds }}
|
||||||
|
|
||||||
keepalive 10 120
|
keepalive 10 120
|
||||||
{% if openvpn_protocol == 'udp' -%}
|
{% if openvpn_protocol == 'udp' -%}
|
||||||
explicit-exit-notify 1
|
explicit-exit-notify 1
|
||||||
|
|||||||
Reference in new issue
Block a user