nixos: fix some remaining consequences of network-online.target dep fix

doc/languages-frameworks/beam.section.md

@@ -237,7 +237,7 @@ in
 {
   systemd.services.${release_name} = {
     wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" "postgresql.service" ];
+    after = [ "network-online.target" "postgresql.service" ];
     # note that if you are connecting to a postgres instance on a different host
     # postgresql.service should not be included in the requires.
     requires = [ "network-online.target" "postgresql.service" ];

nixos/modules/services/audio/liquidsoap.nix

@@ -10,6 +10,7 @@ let
     let stream = builtins.getAttr name config.services.liquidsoap.streams; in
     { inherit name;
       value = {
+        wants = [ "network-online.target" ];
         after = [ "network-online.target" "sound.target" ];
         description = "${name} liquidsoap stream";
         wantedBy = [ "multi-user.target" ];

nixos/modules/services/audio/mopidy.nix

@@ -76,6 +76,7 @@ in {
 
     systemd.services.mopidy = {
       wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
       after = [ "network-online.target" "sound.target" ];
       description = "mopidy music player daemon";
       serviceConfig = {

nixos/modules/services/audio/tts.nix

@@ -87,6 +87,7 @@ in
     systemd.services = mapAttrs' (server: options:
       nameValuePair "tts-${server}" {
         description = "Coqui TTS server instance ${server}";
+        wants = [ "network-online.target" ];
         after = [
           "network-online.target"
         ];

nixos/modules/services/audio/wyoming/faster-whisper.nix

@@ -123,6 +123,7 @@ in
       nameValuePair "wyoming-faster-whisper-${server}" {
         inherit (options) enable;
         description = "Wyoming faster-whisper server instance ${server}";
+        wants = [ "network-online.target" ];
         after = [
           "network-online.target"
         ];

nixos/modules/services/audio/wyoming/openwakeword.nix

@@ -109,6 +109,7 @@ in
   config = mkIf cfg.enable {
     systemd.services."wyoming-openwakeword" = {
       description = "Wyoming openWakeWord server";
+      wants = [ "network-online.target" ];
       after = [
         "network-online.target"
       ];

nixos/modules/services/audio/wyoming/piper.nix

@@ -118,6 +118,7 @@ in
       nameValuePair "wyoming-piper-${server}" {
         inherit (options) enable;
         description = "Wyoming Piper server instance ${server}";
+        wants = [ "network-online.target" ];
         after = [
           "network-online.target"
         ];

nixos/modules/services/backup/borgbackup.nix

@@ -123,6 +123,7 @@ let
       };
       # if remote-backup wait for network
       after = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target";
+      wants = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target";
     };
 
   # utility function around makeWrapper

nixos/modules/services/backup/tarsnap.nix

@@ -355,6 +355,7 @@ in
 
       (mapAttrs' (name: cfg: nameValuePair "tarsnap-restore-${name}"{
         description = "Tarsnap restore '${name}'";
+        after       = [ "network-online.target" ];
         requires    = [ "network-online.target" ];
 
         path = with pkgs; [ iputils gcfg.package util-linux ];

nixos/modules/services/misc/errbot.nix

@@ -88,6 +88,7 @@ in {
         "/var/lib/errbot/${name}";
     in {
       after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         mkdir -p ${dataDir}

nixos/modules/services/misc/lifecycled.nix

@@ -135,7 +135,9 @@ in
 
       systemd.packages = [ pkgs.lifecycled ];
       systemd.services.lifecycled = {
-        wantedBy = [ "network-online.target" ];
+        after = [ "network-online.target" ];
+        wants = [ "network-online.target" ];
+        wantedBy = [ "multi-user.target" ];
         restartTriggers = [ configFile ];
       };
     })
@@ -153,6 +155,7 @@ in
       systemd.timers.lifecycled-queue-cleaner = {
         description = "Lifecycle Daemon Queue Cleaner Timer";
         wantedBy = [ "timers.target" ];
+        wants = [ "network-online.target" ];
         after = [ "network-online.target" ];
         timerConfig = {
           Unit = "lifecycled-queue-cleaner.service";

nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix

@@ -55,6 +55,7 @@ in
       description = "Alertmanager IRC Relay";
 
       wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
 
       serviceConfig = {

nixos/modules/services/monitoring/prometheus/sachet.nix

@@ -64,6 +64,7 @@ in
 
     systemd.services.sachet = {
       wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
       after = [ "network.target" "network-online.target" ];
       script = ''
         ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /tmp/sachet.yaml

nixos/modules/services/network-filesystems/samba.nix

@@ -216,7 +216,7 @@ in
         systemd = {
           targets.samba = {
             description = "Samba Server";
-            after = [ "network.target" ];
+            after = [ "network-online.target" ];
             wants = [ "network-online.target" ];
             wantedBy = [ "multi-user.target" ];
           };

nixos/modules/services/networking/chisel-server.nix

@@ -53,7 +53,11 @@ in {
   config = mkIf cfg.enable {
     systemd.services.chisel-server = {
       description = "Chisel Tunnel Server";
-      wantedBy = [ "network-online.target" ];
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+
+      after = [ "network-online.target" ];
 
       serviceConfig = {
         ExecStart = "${pkgs.chisel}/bin/chisel server " + concatStringsSep " " (

nixos/modules/services/networking/connman.nix

@@ -100,7 +100,13 @@ in {
     systemd.services.connman = {
       description = "Connection service";
       wantedBy = [ "multi-user.target" ];
-      after = [ "syslog.target" ] ++ lib.optional enableIwd "iwd.service";
+
+      # see systemd.special(7): since we are a provider, we pull in
+      # network.target, while ordered before it.
+      before = [ "network.target" "NetworkManager-wait-online.service" ];
+      wants = [ "network.target" ];
+      after = [ "syslog.target" "network-pre.target" ] ++ lib.optional enableIwd "iwd.service";
+
       requires = lib.optional enableIwd "iwd.service";
       serviceConfig = {
         Type = "dbus";

nixos/modules/services/networking/iodine.nix

@@ -130,7 +130,12 @@ in
         createIodineClientService = name: cfg:
           {
             description = "iodine client - ${name}";
-            after = [ "network.target" ];
+
+            # Seems to save bad network state, breaking it if it is started too
+            # early relative to the network.
+            wants = [ "network-online.target" ];
+            after = [ "network-online.target" ];
+
             wantedBy = [ "multi-user.target" ];
             script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${builtins.toString cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}";
             serviceConfig = {
@@ -164,7 +169,12 @@ in
         ) // {
           iodined = mkIf (cfg.server.enable) {
             description = "iodine, ip over dns server daemon";
-            after = [ "network.target" ];
+
+            # Seems to save bad network state, breaking it if it is started too
+            # early relative to the network.
+            wants = [ "network-online.target" ];
+            after = [ "network-online.target" ];
+
             wantedBy = [ "multi-user.target" ];
             script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${builtins.toString cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}";
             serviceConfig = {

nixos/modules/services/networking/kea.nix

@@ -283,6 +283,7 @@ in
         "network-online.target"
         "time-sync.target"
       ];
+      wants = [ "network-online.target" ];
       wantedBy = [
         "kea-dhcp4-server.service"
         "kea-dhcp6-server.service"

nixos/modules/services/networking/netclient.nix

@@ -14,6 +14,7 @@ in
     environment.systemPackages = [ cfg.package ];
     systemd.services.netclient = {
       wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       description = "Netclient Daemon";
       serviceConfig = {

nixos/modules/services/networking/networkmanager.nix

@@ -550,7 +550,13 @@ in
     ];
 
     systemd.services.NetworkManager = {
-      wantedBy = [ "network.target" ];
+      # see systemd.special(7): since we are a provider, we pull in
+      # network.target, while ordered before it.
+      before = [ "network.target" "NetworkManager-wait-online.service" ];
+      after = [ "network-pre.target" ];
+      wants = [ "network.target" ];
+
+      wantedBy = [ "multi-user.target" ];
       restartTriggers = [ configFile ];
 
       aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
@@ -582,7 +588,7 @@ in
     systemd.services.NetworkManager-ensure-profiles = mkIf (cfg.ensureProfiles.profiles != { }) {
       description = "Ensure that NetworkManager declarative profiles are created";
       wantedBy = [ "multi-user.target" ];
-      before = [ "network-online.target" ];
+      before = [ "network-pre.target" ];
       script = let
         path = id: "/run/NetworkManager/system-connections/${id}.nmconnection";
       in ''

nixos/modules/services/networking/pptpd.nix

@@ -93,6 +93,7 @@ with lib;
     in {
       description = "pptpd server";
 
+      after    = [ "network-online.target" ];
       requires = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 

nixos/modules/services/networking/xl2tpd.nix

@@ -100,6 +100,7 @@ with lib;
     in {
       description = "xl2tpd server";
 
+      after    = [ "network-online.target" ];
       requires = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 

nixos/modules/services/security/bitwarden-directory-connector-cli.nix

@@ -260,6 +260,7 @@ in {
       timers.bitwarden-directory-connector-cli = {
         description = "Sync timer for Bitwarden Directory Connector";
         wantedBy = ["timers.target"];
+        wants = ["network-online.target"];
         after = ["network-online.target"];
         timerConfig = {
           OnCalendar = cfg.interval;

nixos/modules/virtualisation/amazon-init.nix

@@ -72,7 +72,7 @@ in {
       description = "Reconfigure the system from EC2 userdata on startup";
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "multi-user.target" ];
+      after = [ "multi-user.target" "network-online.target" ];
       requires = [ "network-online.target" ];
 
       restartIfChanged = false;

nixos/tests/goss.nix

@@ -28,7 +28,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
         };
         group.root.exists = true;
         kernel-param."kernel.ostype".value = "Linux";
-        service.goss = {
+        service."systemd-journald" = {
           enabled = true;
           running = true;
         };
@@ -43,8 +43,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
     machine.wait_for_unit("goss.service")
     machine.wait_for_open_port(8080)
 
+    # due to incomprehensible race conditions, somehow goss fails to get
+    # answers out of systemctl about systemd-journald being up, despite this
+    # being more or less impossible.
+    machine.sleep(5)
+
     with subtest("returns health status"):
       result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz"))
+      print(result)
 
       assert len(result["results"]) == 10, f".results should be an array of 10 items, was {result['results']!r}"
       assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}"

nixos/tests/jool.nix

@@ -16,7 +16,6 @@ let
   webserver = ip: msg: {
     systemd.services.webserver = {
       description = "Mock webserver";
-      wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       script = ''
         while true; do
@@ -197,6 +196,9 @@ in
 
       for node in [client, homeserver, server]:
         node.wait_for_unit("network-addresses-eth1.service")
+        # Ensure interfaces come up
+        node.systemctl("start network-online.target")
+        node.wait_for_unit("network-online.target")
 
       with subtest("Client can ping the WAN server"):
         router.wait_for_unit("jool-nat64-default.service")

nixos/tests/kea.nix

@@ -178,6 +178,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: {
   testScript = { ... }: ''
     start_all()
     router.wait_for_unit("kea-dhcp4-server.service")
+    client.systemctl("start systemd-networkd-wait-online.service")
     client.wait_for_unit("systemd-networkd-wait-online.service")
     client.wait_until_succeeds("ping -c 5 10.0.0.1")
     router.wait_until_succeeds("ping -c 5 10.0.0.3")

nixos/tests/mediamtx.nix

@@ -23,6 +23,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
           DynamicUser = true;
           Restart = "on-failure";
           RestartSec = "1s";
+          # restart service without going through failed/inactive state that confuses wait_for_unit
+          RestartMode = "direct";
           TimeoutStartSec = "10s";
           ExecStart = "${lib.getBin pkgs.ffmpeg-headless}/bin/ffmpeg -re -f lavfi -i smptebars=size=800x600:rate=10 -c libx264 -f flv rtmp://localhost:1935/test";
         };
@@ -37,6 +39,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
           DynamicUser = true;
           Restart = "on-failure";
           RestartSec = "1s";
+          # restart service without going through failed/inactive state that confuses wait_for_unit
+          RestartMode = "direct";
           TimeoutStartSec = "10s";
           ExecStart = "${lib.getBin pkgs.ffmpeg-headless}/bin/ffmpeg -y -re -i rtmp://localhost:1935/test -f flv /dev/null";
         };

nixos/tests/rss2email.nix

@@ -60,7 +60,8 @@ import ./make-test-python.nix {
     server.wait_for_unit("opensmtpd")
     server.wait_for_unit("dovecot2")
     server.wait_for_unit("nginx")
-    server.wait_for_unit("rss2email")
+    # rss2email finishes its work and then exits, so it may not still be running; thus we just wait till it exits success.
+    server.wait_until_succeeds("systemctl show rss2email.service | grep Result=success")
 
     server.wait_until_succeeds("check-mail-landed >&2")
   '';

nixos/tests/rsyncd.nix

@@ -30,6 +30,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
     start_all()
     a.wait_for_unit("rsync")
     b.wait_for_unit("sockets.target")
+
+    # the network has to be "online" for the hosts to be reachable over IP
+    a.systemctl("start network-online.target")
+    b.systemctl("start network-online.target")
+    a.wait_for_unit("network-online.target")
+    b.wait_for_unit("network-online.target")
+
     b.succeed("rsync a::")
     a.succeed("rsync b::")
   '';

nixos/tests/systemd-bpf.nix

@@ -31,6 +31,8 @@ import ./make-test-python.nix ({ lib, ... }: {
 
   testScript = ''
     start_all()
+    node1.systemctl("start network-online.target")
+    node2.systemctl("start network-online.target")
     node1.wait_for_unit("systemd-networkd-wait-online.service")
     node2.wait_for_unit("systemd-networkd-wait-online.service")
 

nixos/tests/systemd-machinectl.nix

@@ -69,7 +69,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
 
       # Test machinectl start
       machine.succeed("machinectl start ${containerName}");
-      machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target");
+      machine.wait_until_succeeds("systemctl -M ${containerName} start network-online.target");
+      machine.wait_until_succeeds("systemctl -M ${containerName} is-active network-online.target");
 
       # Test nss_mymachines without nscd
       machine.succeed('LD_LIBRARY_PATH="/run/current-system/sw/lib" getent -s hosts:mymachines hosts ${containerName}');

nixos/tests/systemd-networkd.nix

@@ -88,7 +88,9 @@ in import ./make-test-python.nix ({pkgs, ... }: {
   };
 testScript = ''
     start_all()
+    node1.systemctl("start network-online.target")
     node1.wait_for_unit("systemd-networkd-wait-online.service")
+    node2.systemctl("start network-online.target")
     node2.wait_for_unit("systemd-networkd-wait-online.service")
 
     # ================================