diff --git a/nixos/modules/services/games/quake3-server.nix b/nixos/modules/services/games/quake3-server.nix index d0bc52102277..98e74eb71f69 100644 --- a/nixos/modules/services/games/quake3-server.nix +++ b/nixos/modules/services/games/quake3-server.nix @@ -108,7 +108,7 @@ in systemd.services.q3ds = { description = "Quake 3 dedicated server"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; environment.HOME = if baseq3InStore then home else cfg.baseq3; diff --git a/nixos/modules/services/home-automation/govee2mqtt.nix b/nixos/modules/services/home-automation/govee2mqtt.nix index afdff7b8e047..48c676538ddf 100644 --- a/nixos/modules/services/home-automation/govee2mqtt.nix +++ b/nixos/modules/services/home-automation/govee2mqtt.nix @@ -53,7 +53,7 @@ in description = "Govee2MQTT Service"; wantedBy = [ "multi-user.target" ]; after = [ - "networking.target" + "network.target" "network-online.target" ]; requires = [ "network-online.target" ]; diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix index ea8694727c63..702bc3f90150 100644 --- a/nixos/modules/services/monitoring/alerta.nix +++ b/nixos/modules/services/monitoring/alerta.nix @@ -92,7 +92,7 @@ in systemd.services.alerta = { description = "Alerta Monitoring System"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; environment = { ALERTA_SVR_CONF_FILE = alertaConf; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index edcfc592d0d1..e26600bd0e8e 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -2045,7 +2045,7 @@ in description = "Grafana Service Daemon"; wantedBy = [ "multi-user.target" ]; after = [ - "networking.target" + "network.target" ] ++ lib.optional usePostgresql "postgresql.target" ++ lib.optional useMysql "mysql.service"; diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix index db4ed1beb12b..960703b771df 100644 --- a/nixos/modules/services/monitoring/kapacitor.nix +++ b/nixos/modules/services/monitoring/kapacitor.nix @@ -169,7 +169,7 @@ in systemd.services.kapacitor = { description = "Kapacitor Real-Time Stream Processing Engine"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; serviceConfig = { ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}"; User = "kapacitor"; diff --git a/nixos/modules/services/network-filesystems/litestream/default.nix b/nixos/modules/services/network-filesystems/litestream/default.nix index d8d3440c25d3..487ee36a81f1 100644 --- a/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/nixos/modules/services/network-filesystems/litestream/default.nix @@ -74,7 +74,7 @@ in systemd.services.litestream = { description = "Litestream"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; serviceConfig = { EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; ExecStart = "${cfg.package}/bin/litestream replicate"; diff --git a/nixos/modules/services/web-apps/convos.nix b/nixos/modules/services/web-apps/convos.nix index e99edf0cc35d..84a21dc643d1 100644 --- a/nixos/modules/services/web-apps/convos.nix +++ b/nixos/modules/services/web-apps/convos.nix @@ -41,7 +41,7 @@ in systemd.services.convos = { description = "Convos Service"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; environment = { CONVOS_HOME = "%S/convos"; CONVOS_REVERSE_PROXY = if cfg.reverseProxy then "1" else "0"; diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix index 4a38d9589678..cc24766b4763 100644 --- a/nixos/modules/services/web-apps/cryptpad.nix +++ b/nixos/modules/services/web-apps/cryptpad.nix @@ -134,7 +134,7 @@ in systemd.services.cryptpad = { description = "Cryptpad service"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; serviceConfig = { BindReadOnlyPaths = [ cryptpadConfigFile diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index 745d9bdb1fa8..10fc56d1a855 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -99,7 +99,7 @@ in description = "dex identity provider"; wantedBy = [ "multi-user.target" ]; after = [ - "networking.target" + "network.target" ] ++ (optional (cfg.settings.storage.type == "postgres") "postgresql.target"); path = with pkgs; [ replace-secret ]; diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 07ed6b3a056d..61ad0a3a1a05 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -294,7 +294,7 @@ in description = "HedgeDoc Service"; documentation = [ "https://docs.hedgedoc.org/" ]; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; preStart = let configFile = settingsFormat.generate "hedgedoc-config.json" { diff --git a/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix index a7a2cf9192ba..bc9eeea4e2de 100644 --- a/nixos/modules/services/web-apps/hledger-web.nix +++ b/nixos/modules/services/web-apps/hledger-web.nix @@ -134,7 +134,7 @@ in "https://hledger.org/hledger-web.html" ]; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; serviceConfig = mkMerge [ { ExecStart = "${pkgs.hledger-web}/bin/hledger-web ${serverArgs}"; diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix index 1b999e7abc86..bea41d241396 100644 --- a/nixos/modules/services/web-apps/node-red.nix +++ b/nixos/modules/services/web-apps/node-red.nix @@ -119,7 +119,7 @@ in systemd.services.node-red = { description = "Node-RED Service"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; environment = { HOME = cfg.userDir; }; diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index e61ef35df28e..3ab7bb88eaec 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -679,7 +679,7 @@ in description = "Outline wiki and knowledge base"; wantedBy = [ "multi-user.target" ]; after = [ - "networking.target" + "network.target" ] ++ lib.optional (cfg.databaseUrl == "local") "postgresql.target" ++ lib.optional (cfg.redisUrl == "local") "redis-outline.service"; diff --git a/nixos/modules/services/web-apps/powerdns-admin.nix b/nixos/modules/services/web-apps/powerdns-admin.nix index e990807d00b4..4247dca696f9 100644 --- a/nixos/modules/services/web-apps/powerdns-admin.nix +++ b/nixos/modules/services/web-apps/powerdns-admin.nix @@ -84,7 +84,7 @@ in systemd.services.powerdns-admin = { description = "PowerDNS web interface"; wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; + after = [ "network.target" ]; environment.FLASK_CONF = builtins.toFile "powerdns-admin-config.py" configText; environment.PYTHONPATH = pkgs.powerdns-admin.pythonPath; diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix index f6ef1b03fcab..44d4af92017a 100644 --- a/nixos/tests/certmgr.nix +++ b/nixos/tests/certmgr.nix @@ -103,7 +103,7 @@ let }; systemd.services.cfssl.after = [ "cfssl-init.service" - "networking.target" + "network.target" ]; systemd.tmpfiles.rules = [ "d /var/ssl 777 root root" ];