From 8782edff0f285ffb3d5b8c79d22d024334ed3e1e Mon Sep 17 00:00:00 2001 From: Slawomir Koszewski Date: Sat, 24 Oct 2026 12:50:49 +0200 Subject: [PATCH] fix: the status page shows whether the Router Manager runs. --- README.md | 3 ++- debian-package/debian/changelog | 9 +++++++++ debian-package/src/usr/lib/vpn-router/web | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6407003..5a59832 100644 --- a/README.md +++ b/README.md @@ -528,7 +528,8 @@ curl http://10.0.0.4:17081/ | `/account` | The account of the signed-in user: its details, its password and its TOTP enrolment; needs a user's token | The status holds the state of `vpn-router-setup`, `slapd` and each PostgreSQL cluster unit -(`postgresql@-`, or `postgresql` as `no cluster` without one), of `strongswan` when site-to-site or +(`postgresql@-`, or `postgresql` as `no cluster` without one), of +`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 `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, diff --git a/debian-package/debian/changelog b/debian-package/debian/changelog index e9c0214..ae9edef 100644 --- a/debian-package/debian/changelog +++ b/debian-package/debian/changelog @@ -1,3 +1,12 @@ +vpn-router (0.12.1-1) unstable; urgency=medium + + fix: the status page shows whether the Router Manager runs. + + * When vpn-router-manager is installed, the services show the state of + vpn-router-manager, and status is degraded while it is not active. + + -- Slawomir Koszewski Sun, 25 Oct 2026 11:00:00 +0200 + vpn-router (0.12.0-1) unstable; urgency=medium feature: every user manages their own account through /account. diff --git a/debian-package/src/usr/lib/vpn-router/web b/debian-package/src/usr/lib/vpn-router/web index b93b8c9..d47908d 100644 --- a/debian-package/src/usr/lib/vpn-router/web +++ b/debian-package/src/usr/lib/vpn-router/web @@ -258,6 +258,9 @@ def collect(state): """The status document. state says which features the router has.""" units = {'vpn-router-setup': unit_state('vpn-router-setup.service'), 'slapd': unit_state('slapd.service'), **postgresql_clusters()} + manager_version = package_version('vpn-router-manager') + if manager_version: + units['vpn-router-manager'] = unit_state('vpn-router-manager.service') if state.get('site_to_site') or state.get('p2s'): units['strongswan'] = unit_state('strongswan.service') if state.get('wireguard'): @@ -268,7 +271,7 @@ def collect(state): status = { 'status': 'ok' if all(value == 'active' for value in units.values()) else 'degraded', 'version': package_version(), - 'manager_version': package_version('vpn-router-manager'), + 'manager_version': manager_version, 'time': time.strftime('%Y-%m-%dT%H:%M:%S%z'), 'units': units, 'docker': docker_status(),