diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2021-11-30 21:40:35 +0100 |
|---|---|---|
| committer | Astro <astro@spaceboyz.net> | 2021-11-30 21:43:51 +0100 |
| commit | aa37441c3ee910ae071156cb8914f767c8403baf (patch) | |
| tree | 79660c25fbea5b7829932f9f00c3e54c9a6e1c48 /nixos | |
| parent | 036b9094211e223dce4de233c0063a6fcd47deb8 (diff) | |
| download | nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.tar nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.tar.gz nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.tar.bz2 nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.tar.lz nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.tar.xz nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.tar.zst nixpkgs-aa37441c3ee910ae071156cb8914f767c8403baf.zip | |
nixos/drbd: fix
- fix environment.etc."drbd.conf" - don't generate an ExecStart script for just one command
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/network-filesystems/drbd.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix index 916e7eaaaa9..c730e0b34e9 100644 --- a/nixos/modules/services/network-filesystems/drbd.nix +++ b/nixos/modules/services/network-filesystems/drbd.nix @@ -47,19 +47,17 @@ let cfg = config.services.drbd; in options drbd usermode_helper=/run/current-system/sw/bin/drbdadm ''; - environment.etc.drbd.conf = + environment.etc."drbd.conf" = { source = pkgs.writeText "drbd.conf" cfg.config; }; systemd.services.drbd = { after = [ "systemd-udev.settle.service" "network.target" ]; wants = [ "systemd-udev.settle.service" ]; wantedBy = [ "multi-user.target" ]; - script = '' - ${pkgs.drbd}/sbin/drbdadm up all - ''; - serviceConfig.ExecStop = '' - ${pkgs.drbd}/sbin/drbdadm down all - ''; + serviceConfig = { + ExecStart = "${pkgs.drbd}/sbin/drbdadm up all"; + ExecStop = "${pkgs.drbd}/sbin/drbdadm down all"; + }; }; }; } |