feature: the package installs the Router Manager, which is no longer a package of its own.
Release / release (push) Failing after 4s

This commit is contained in:
slawek committed 2026-11-14 12:52:44 +01:00
1 parent 6d90441bee
commit 8efe21bfa6
129 files changed
+17381 -104

No files matched your search

+32
View File
@@ -1,3 +1,35 @@
vpn-router (0.40.0-1) unstable; urgency=medium
feature: the package installs the Router Manager, which is no longer a
package of its own.
* The Router Manager, vpn-router-manager.service, is installed and started
with the router; its programs are in /usr/lib/vpn-router, its application
and help in /usr/share/vpn-router/manager.
* Its settings are /etc/vpn-router/manager.json, its database password
/etc/vpn-router/manager-database.secret and the state of its upgrades
/var/lib/vpn-router/upgrade.json and system-upgrade.json.
* The debconf questions vpn-router/admin_username and admin_password give
its first administrator, written to /etc/vpn-router/manager-admin.json.
* The Overview tab and the upgrade helper know the package vpn-router
alone.
* The bootstrap page on port 17081 shows the manager's service and log;
port 17080 and vpn-router-manager-bootstrap are gone.
* The status has no manager_version; the manager's unit is always among
the services.
* The package cannot be installed beside the package vpn-router-manager,
which has to be removed first.
* A purge also removes the manager's settings, its database and role, and
the record of its upgrades.
* build.sh, publish.sh and the Dockerfile are in the repository root, the
build also builds the application in web/, and CONTAINER_RUNTIME chooses
the container runtime.
* The README and the ADR call the product that deploys the router Cloud
Manager, also where they named manage-ui, and the docstring of the GCP
platform names Google Cloud.
-- Slawomir Koszewski <slawek@koszewscy.waw.pl> Fri, 13 Nov 2026 20:15:15 +0100
vpn-router (0.39.1-1) unstable; urgency=medium
fix: the web service starts again after its first start with 0.39.0, and the
+10
View File
@@ -12,6 +12,16 @@ fi
# preseeded completes without prompting. The defaults are platform "none" and
# mode "manual", which together mean: install the files, configure nothing.
# The Router Manager's first administrator, asked whatever the platform is; the password only with a name.
db_input medium vpn-router/admin_username || true
db_go || true
db_get vpn-router/admin_username
if [ -n "$RET" ]; then
db_input medium vpn-router/admin_password || true
db_go || true
fi
db_input high vpn-router/platform || true
db_go || true
+7 -1
View File
@@ -28,6 +28,7 @@ Depends: ${misc:Depends},
python3-psycopg,
python3-psutil,
python3-prometheus-client,
python3-requests,
postgresql,
slapd,
nslcd,
@@ -46,7 +47,7 @@ Suggests: caddy,
pdns-server,
pdns-backend-pgsql,
proxmox-backup-client-static
Description: Linux VPN router with IPSec, IKEv2, OpenVPN and WireGuard support
Description: Linux VPN router with IPSec, IKEv2, OpenVPN, WireGuard and a web manager
Configures a Linux host or virtual machine as a VPN router: site-to-site
IKEv2 IPSec (strongSwan swanctl) with pre-shared keys or certificates,
optional IKEv2 access using EAP-TLS, optional OpenVPN with a
@@ -64,6 +65,11 @@ Description: Linux VPN router with IPSec, IKEv2, OpenVPN and WireGuard support
or to a Proxmox Backup Server. Nothing in the package is specific to a cloud
provider.
.
The Router Manager, a web application served by the router, shows the
router's state and manages its users, connections, certificates, web sites,
name server, backups and packages. Users sign in through the router's web
service; their sessions are kept in PostgreSQL.
.
Settings live in /etc/vpn-router/vpn-router.json, which is created on first
install and owned by the administrator afterwards. Editing it and restarting
vpn-router-setup applies the change; the same service reconciles the system
+1
View File
@@ -2,4 +2,5 @@ etc/vpn-router
usr/lib/vpn-router
usr/lib/vpn-router/vpnrouter_platforms
usr/share/vpn-router/templates
usr/share/vpn-router/manager/web
var/lib/vpn-router/sites
+6
View File
@@ -37,9 +37,15 @@ src/usr/lib/vpn-router/metrics usr/lib/vpn-router/
src/usr/lib/vpn-router/bootstrap usr/lib/vpn-router/
src/usr/lib/vpn-router/wait-for-libpq usr/lib/vpn-router/
src/usr/lib/vpn-router/generate-config usr/lib/vpn-router/
src/usr/lib/vpn-router/manager usr/lib/vpn-router/
src/usr/lib/vpn-router/vpnrouter_manager.py usr/lib/vpn-router/
src/usr/lib/vpn-router/upgrade usr/lib/vpn-router/
src/usr/lib/vpn-router/vpnrouter_platforms/*.py usr/lib/vpn-router/vpnrouter_platforms/
src/usr/share/vpn-router/templates/* usr/share/vpn-router/templates/
src/usr/share/vpn-router/sql/* usr/share/vpn-router/sql/
src/usr/share/bash-completion/completions/*.bash usr/share/bash-completion/completions/
src/usr/lib/systemd/system/caddy.service.d/vpn-router.conf usr/lib/systemd/system/caddy.service.d/
src/usr/share/doc/vpn-router/vpn-router.json.example usr/share/doc/vpn-router/
src/usr/share/doc/vpn-router/manager.json.example usr/share/doc/vpn-router/
web/dist/* usr/share/vpn-router/manager/web/
docs/* usr/share/vpn-router/manager/docs/
+20 -3
View File
@@ -63,6 +63,22 @@ case "$1" in
# not blank the key on the next dpkg-reconfigure.
db_set vpn-router/psk ""
# The Router Manager's administrator account for vpn-router-setup to create, when a name and a
# password were given; the answers are cleared so that a later run does not ask for it again.
db_get vpn-router/admin_username
ADMIN_USERNAME="$RET"
db_get vpn-router/admin_password
ADMIN_PASSWORD="$RET"
if [ -n "$ADMIN_USERNAME" ] && [ -n "$ADMIN_PASSWORD" ]; then
(umask 077; ADMIN_USERNAME="$ADMIN_USERNAME" ADMIN_PASSWORD="$ADMIN_PASSWORD" python3 -c \
'import json, os, sys; json.dump({"username": os.environ["ADMIN_USERNAME"], "password": os.environ["ADMIN_PASSWORD"]}, sys.stdout)' \
> /etc/vpn-router/manager-admin.json)
elif [ -n "$ADMIN_USERNAME" ]; then
echo 'vpn-router: no administrator password was given; no Router Manager administrator is created' >&2
fi
db_set vpn-router/admin_username ""
db_set vpn-router/admin_password ""
# Apply the sysctl drop-in shipped by this package so it takes effect
# without waiting for a reboot.
sysctl --system >/dev/null
@@ -71,12 +87,13 @@ case "$1" in
# setting the forward policy all belong to vpn-router-setup, which does
# them only once the configuration says this host is a router.
# The setup and web services wait for libpq in the linker cache, which
# dpkg refreshes after this script, so they are started without waiting
# for them.
# The setup, web and manager services wait for libpq in the linker cache,
# which dpkg refreshes after this script, so they are started without
# waiting for them.
if [ -d /run/systemd/system ]; then
systemctl --no-block restart vpn-router-setup.service >/dev/null 2>&1 || true
systemctl --no-block restart vpn-router-web.service >/dev/null 2>&1 || true
systemctl --no-block restart vpn-router-manager.service >/dev/null 2>&1 || true
fi
;;
esac
+9 -2
View File
@@ -56,6 +56,12 @@ case "$1" in
/etc/vpn-router/web.key \
/etc/vpn-router/oidc.key \
/etc/vpn-router/metrics.secret \
/etc/vpn-router/manager.json \
/etc/vpn-router/manager-admin.json \
/var/lib/vpn-router/upgrade.json \
/var/lib/vpn-router/upgrade.log \
/var/lib/vpn-router/system-upgrade.json \
/var/lib/vpn-router/system-upgrade.log \
/etc/systemd/system/vpn-router-backup.timer.d/schedule.conf \
/etc/sudoers.d/vpn-router \
/etc/ssh/sshd_config.d/vpn-router.conf \
@@ -76,8 +82,9 @@ case "$1" in
fi
rm -f /etc/vpn-router/database.secret
# The databases and roles of the web sites and of the name server, when the package created them.
for database in vpn-router-sites vpn-router-dns; do
# The databases and roles of the web sites, of the name server and of the Router Manager's sessions,
# when the package created them.
for database in vpn-router-sites vpn-router-dns vpn-router-manager; do
secret="/etc/vpn-router/${database#vpn-router-}-database.secret"
if [ -f "$secret" ] && command -v psql >/dev/null 2>&1; then
runuser -u postgres -- psql -X -q -c "DROP DATABASE IF EXISTS \"$database\"" || true
+4
View File
@@ -2,8 +2,12 @@
%:
dh $@
override_dh_auto_build:
test -f web/dist/index.html
override_dh_installsystemd:
dh_installsystemd --name=vpn-router-setup --no-start
dh_installsystemd --name=vpn-router-manager --no-start
dh_installsystemd --name=vpn-router-docker
dh_installsystemd --name=vpn-router-web --no-start
dh_installsystemd --name=vpn-router-metrics --no-enable --no-start
+18
View File
@@ -13,6 +13,24 @@ Description: Platform:
.
generic configures the router with no platform-specific additions.
Template: vpn-router/admin_username
Type: string
Default:
Description: Name of the Router Manager's administrator account:
The Router Manager can have a first administrator: a Manager-only account
of the router's user directory, a member of the group admins, which may
sign in to the Router Manager but has no VPN access. vpn-router-setup
creates it.
.
Leave this empty to create no account and no group.
Template: vpn-router/admin_password
Type: password
Description: Password of the administrator account:
The password of the administrator account, 8 to 128 characters. It is
passed to vpn-router-setup in a file readable by root only, which is removed
once the account exists, and not kept by debconf.
Template: vpn-router/mode
Type: select
Choices: manual, interfaces, auto
@@ -0,0 +1,21 @@
[Unit]
Description=VPN Router Manager web application
Documentation=file:/usr/share/doc/vpn-router/README.md
After=network-online.target postgresql.service
Wants=network-online.target
[Service]
Type=simple
ExecStartPre=/usr/lib/vpn-router/wait-for-libpq
ExecStart=/usr/bin/python3 /usr/lib/vpn-router/manager
TimeoutStartSec=5min
Restart=on-failure
RestartSec=15
NoNewPrivileges=yes
ProtectSystem=strict
ReadWritePaths=-/etc/vpn-router
ProtectHome=yes
PrivateTmp=yes
[Install]
WantedBy=multi-user.target