diff --git a/README.md b/README.md index d164439..5ff909f 100644 --- a/README.md +++ b/README.md @@ -1006,7 +1006,7 @@ when it ended and why, and each refused ticket or shell with the reason. | `wireguard` | The public key and port of `wg0`, and each peer's public key, endpoint, allowed IPs, handshake age and traffic; no private or preshared key | | `docker` | `docker.exposed_ports` and the rules of the `VPN-ROUTER-DOCKER` chain | | `postgresql` | `clusters`: each PostgreSQL cluster of `pg_lsclusters` with its version, name, port, status and data directory, and for one that is online its `settings`: `server_version`, `listen_addresses`, `port`, `max_connections`, `shared_buffers`, `effective_cache_size`, `work_mem`, `password_encryption`, `ssl` and `timezone`; `null` when `pg_lsclusters` fails | -| `caddy` | The installed Caddy: `version`, and `source`, `upstream` once Caddy's repository is configured and `ubuntu` otherwise; `null` when Caddy is not installed | +| `caddy` | The installed Caddy: `version`, `source`, `upstream` once Caddy's repository is configured and `ubuntu` otherwise, and `service`, the state of `caddy.service`; `null` when Caddy is not installed | ### The /postgresql page diff --git a/debian-package/debian/changelog b/debian-package/debian/changelog index 312b2a5..810940b 100644 --- a/debian-package/debian/changelog +++ b/debian-package/debian/changelog @@ -1,3 +1,11 @@ +vpn-router (0.25.3-1) unstable; urgency=medium + + fix: /config gives the state of caddy.service with the installed Caddy, for the Router Manager's Web page. + + * caddy of /config is {"version", "source", "service"}. + + -- Slawomir Koszewski Tue, 03 Nov 2026 05:00:00 +0100 + vpn-router (0.25.2-1) unstable; urgency=medium fix: wireguard.address must be the router's own address in its network, not the network or broadcast address, from which the peers' addresses are told apart. diff --git a/debian-package/src/usr/lib/vpn-router/web b/debian-package/src/usr/lib/vpn-router/web index 1af3d35..4ad2251 100644 --- a/debian-package/src/usr/lib/vpn-router/web +++ b/debian-package/src/usr/lib/vpn-router/web @@ -403,7 +403,7 @@ def postgresql_databases(): def details(state): """What /config shows: the configuration without its secrets, and what the router resolved and runs; caddy is the - installed Caddy, {version, source}, null when it is not installed.""" + installed Caddy, {version, source, service}, service the state of caddy.service, null when it is not installed.""" configuration = state.get('configuration', {}) caddy = package_version('caddy') return { @@ -420,8 +420,8 @@ def details(state): }, 'postgresql': postgresql_configuration(), # Caddy is upstream's once its repository is configured (vpn-router-caddy). - 'caddy': {'version': caddy, 'source': 'upstream' if vpnrouter.CADDY_APT_SOURCE.is_file() else 'ubuntu'} - if caddy else None, + 'caddy': {'version': caddy, 'source': 'upstream' if vpnrouter.CADDY_APT_SOURCE.is_file() else 'ubuntu', + 'service': unit_state('caddy.service')} if caddy else None, }