fix: keel-overlay-vip ships every unit off on the first installation

.github/workflows/packages.yml

@@ -84,7 +84,7 @@ jobs:
       download: overlay-debs
       download-dir: dist
       run: |
-        KEEL_COMMIT=3c6e45636d9a3c9fb5e04fac3a0aecf7bfc8b58a
+        KEEL_COMMIT=befaaea21e9c983fbb8b2ad4e47f9625866ae857
         INITHOOKS_COMMIT=2543d506590a17a762a4288e2ee99b0a3c160386
         CONFCONSOLE_COMMIT=71828736ca7e99fff1d99ce5e9e9002c24dbd8b2
         apt-get update -qq
@@ -121,6 +121,7 @@ jobs:
           ./dist/keel-overlay-wireguard_*.deb \
           ./dist/keel-overlay-etcd_*.deb \
           ./dist/keel-overlay-crowdsec_*.deb \
+          ./dist/keel-overlay-vip_*.deb \
           ntpsec
         # unit states and manifests on the machine
         KEEL_OVERLAY_INSTALL_TEST=1 bats tests/overlay-install.bats

packages/vip/debian/changelog

@@ -1,3 +1,18 @@
+keel-overlay-vip (0.1.1) trixie; urgency=medium
+
+  * Every unit is off on the first installation, like the other overlays
+    (handbook decision 0041). keel-vip-check.timer was enabled by
+    dh_installsystemd, whose was-enabled defaults to true and which does not
+    read the preset, so a standalone machine ran the check every minute.
+    The timer now has no [Install]: keel-vip.service wants it and it is
+    PartOf the controller, so the check runs exactly while keel spec apply
+    keeps the VIP enabled, and stops with it. Both units are installed with
+    --no-enable --no-start and both are disabled in the preset.
+    tests/overlay-install.bats installs the package on a booted trixie
+    machine and asserts both are disabled and inactive.
+
+ -- KeelLinux maintainers <admin@keellinux.org>  Wed, 07 Oct 2026 23:22:41 +0000
+
 keel-overlay-vip (0.1.0) trixie; urgency=medium
 
   * First release: the units of keel's service VIP on the WireGuard mesh

packages/vip/debian/rules

@@ -25,5 +25,4 @@ execute_after_dh_auto_install:
 # installation: keel spec apply enables it with the overlay. The check's
 # timer runs in every mode.
 override_dh_installsystemd:
-	dh_installsystemd --no-enable --no-start keel-vip.service
-	dh_installsystemd keel-vip-check.timer
+	dh_installsystemd --no-enable --no-start keel-vip.service keel-vip-check.timer

packages/vip/keel-overlay-vip.preset

@@ -1,5 +1,8 @@
-# keel-overlay-vip: the controller is off until keel spec apply enables
-# the overlay (handbook decision 0041): Debian's presets enable every unit
-# they do not name, on a first boot and on `systemctl preset-all`. The
-# check's timer stays enabled; its service skips a node that knows no VIP.
+# keel-overlay-vip: the controller and its check are off until keel spec
+# apply enables the overlay (handbook decision 0041): Debian's presets enable
+# every unit they do not name, on a first boot and on `systemctl
+# preset-all`. The check's timer has no [Install] and runs only while
+# keel-vip.service wants it; it is named here too, so no preset can turn it
+# on by itself.
 disable keel-vip.service
+disable keel-vip-check.timer

packages/vip/keel-vip-check.timer

@@ -1,13 +1,15 @@
 # keel-overlay-vip: keel vip check at boot and every minute (handbook
-# decision 0049: "at boot and on a timer"). It runs in every mode: on a
-# node that knows no VIP the service's condition skips it.
+# decision 0049: "at boot and on a timer"), while the VIP controller runs.
+# The check belongs to the controller: keel-vip.service wants it and this
+# timer is part of it, so it starts and stops with the controller. It has
+# no install section of its own, so nothing enables it by itself, neither
+# the package's installation nor a preset (handbook decision 0041: an
+# overlay's units are off until keel spec apply enables the overlay).
 [Unit]
 Description=keel vip: check the VIPs at boot and every minute
+PartOf=keel-vip.service
 
 [Timer]
 OnBootSec=30s
 OnUnitActiveSec=1min
 AccuracySec=5s
-
-[Install]
-WantedBy=timers.target

packages/vip/keel-vip.service

@@ -19,7 +19,7 @@
 Description=keel vip: the VIP's root helper with etcd
 Documentation=https://github.com/Keel-Linux/keel/blob/main/docs/vip.md
 After=network-online.target etcd.service wg-quick@wg0.service
-Wants=network-online.target
+Wants=network-online.target keel-vip-check.timer
 ConditionPathExists=/var/lib/keel/etcd/cluster.json
 StartLimitIntervalSec=0
 

tests/overlay-install.bats

@@ -6,8 +6,8 @@
 # This suite changes the machine it runs on: it removes, installs and
 # reinstalls packages and enables and disables units. It runs only where
 # KEEL_OVERLAY_INSTALL_TEST=1 says the machine is disposable, as root, after
-# the four keel-overlay-* packages have been installed with their
-# dependencies. OVERLAY_DEBS names the directory holding the four .deb files
+# the five keel-overlay-* packages have been installed with their
+# dependencies. OVERLAY_DEBS names the directory holding the five .deb files
 # (default dist/ of the repository). The CI job "install" runs it in a
 # booted trixie LXC container, where systemd is PID 1 and the is-active
 # assertions are made as well; in a machine where systemd does not run
@@ -22,9 +22,9 @@
 
 bats_require_minimum_version 1.5.0
 
-OVERLAYS=(installer wireguard etcd crowdsec)
+OVERLAYS=(installer wireguard etcd crowdsec vip)
 # the units the simple installation of Keel Core keeps disabled and stopped
-DISABLED_UNITS=(etcd.service crowdsec.service crowdsec-firewall-bouncer.service)
+DISABLED_UNITS=(etcd.service crowdsec.service crowdsec-firewall-bouncer.service keel-vip.service)
 
 setup_file() {
     if [ "${KEEL_OVERLAY_INSTALL_TEST:-}" != 1 ]; then
@@ -192,7 +192,7 @@ assert_simple_state() {
 
 # ------------------------------------------------------------ the packages
 
-@test "the four overlay packages are installed" {
+@test "the five overlay packages are installed" {
     local name
     for name in "${OVERLAYS[@]}"; do
         run dpkg-query -W -f='${db:Status-Status}' "keel-overlay-$name"
@@ -252,6 +252,31 @@ assert_simple_state() {
     [ "$output" != active ]
 }
 
+@test "the VIP check timer is not enabled and not running: it belongs to the controller" {
+    run systemctl is-enabled keel-vip-check.timer
+    echo "$output"
+    # no [Install]: systemd reports static, never enabled
+    [ "$output" = static ]
+    if systemd_running; then
+        run systemctl is-active keel-vip-check.timer
+        [ "$output" = inactive ]
+    fi
+    # the effective unit files as systemctl reads them: the timer is part of
+    # the controller, and the controller wants it
+    run systemctl cat keel-vip-check.timer
+    [ "$status" -eq 0 ]
+    grep -qx 'PartOf=keel-vip.service' <<<"$output"
+    run ! grep -q '^\[Install\]' <<<"$output"
+    run systemctl cat keel-vip.service
+    [ "$status" -eq 0 ]
+    grep -qE '^Wants=.*\bkeel-vip-check\.timer\b' <<<"$output"
+}
+
+@test "the VIP preset disables the controller and its check" {
+    grep -qx 'disable keel-vip.service' /usr/lib/systemd/system-preset/20-keel-overlay-vip.preset
+    grep -qx 'disable keel-vip-check.timer' /usr/lib/systemd/system-preset/20-keel-overlay-vip.preset
+}
+
 @test "the preset systemd applies at first boot says disabled for each unit" {
     local unit
     for unit in "${DISABLED_UNITS[@]}"; do