diff options
| author | Alexander Ried <ried@mytum.de> | 2016-09-10 18:03:59 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-10 18:03:59 +0200 |
| commit | 27bc34f1e471991e43df028edc51159b12405120 (patch) | |
| tree | 755a9ff93c09e6affd01878667ba351c659cf3a7 /nixos/modules/services/monitoring/ups.nix | |
| parent | a28bbba6fc89a72fc65d08b98d79d2fda310b95c (diff) | |
| download | nixpkgs-27bc34f1e471991e43df028edc51159b12405120.tar nixpkgs-27bc34f1e471991e43df028edc51159b12405120.tar.gz nixpkgs-27bc34f1e471991e43df028edc51159b12405120.tar.bz2 nixpkgs-27bc34f1e471991e43df028edc51159b12405120.tar.lz nixpkgs-27bc34f1e471991e43df028edc51159b12405120.tar.xz nixpkgs-27bc34f1e471991e43df028edc51159b12405120.tar.zst nixpkgs-27bc34f1e471991e43df028edc51159b12405120.zip | |
treewide: deprecate ip-up.target (#18319)
Systemd upstream provides targets for networking. This also includes a target network-online.target. In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
Diffstat (limited to 'nixos/modules/services/monitoring/ups.nix')
| -rw-r--r-- | nixos/modules/services/monitoring/ups.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 5f80d547dbc..febf0c95f5b 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -182,7 +182,8 @@ in systemd.services.upsmon = { description = "Uninterruptible Power Supplies (Monitor)"; - wantedBy = [ "ip-up.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "forking"; script = "${pkgs.nut}/sbin/upsmon"; environment.NUT_CONFPATH = "/etc/nut/"; @@ -191,8 +192,8 @@ in systemd.services.upsd = { description = "Uninterruptible Power Supplies (Daemon)"; + after = [ "network.target" "upsmon.service" ]; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "upsmon.service" ]; serviceConfig.Type = "forking"; # TODO: replace 'root' by another username. script = "${pkgs.nut}/sbin/upsd -u root"; @@ -202,8 +203,8 @@ in systemd.services.upsdrv = { description = "Uninterruptible Power Supplies (Register all UPS)"; - wantedBy = [ "multi-user.target" ]; after = [ "upsd.service" ]; + wantedBy = [ "multi-user.target" ]; # TODO: replace 'root' by another username. script = ''${pkgs.nut}/bin/upsdrvctl -u root start''; serviceConfig = { |