diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-12-06 15:21:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 15:21:49 +0100 |
| commit | 57df59ea2d9eab1bd22d159916befd4b121a47ce (patch) | |
| tree | 7660830afac66550e31bcda4844c33f8c634a6fb | |
| parent | 6c6eb8ace6599a33eeb33e28453a601ab02e523e (diff) | |
| parent | dcbc6a443359d49e52dacae1c810154d249e3a5d (diff) | |
Merge pull request #247 from happysalada/fix_nextdns
nextdns: add to modulelist
| -rw-r--r-- | modules/module-list.nix | 1 | ||||
| -rw-r--r-- | modules/services/nextdns/default.nix | 6 | ||||
| -rw-r--r-- | release.nix | 1 | ||||
| -rw-r--r-- | tests/services-nextdns.nix | 17 |
4 files changed, 21 insertions, 4 deletions
diff --git a/modules/module-list.nix b/modules/module-list.nix index 6375ea3..d7ba550 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -57,6 +57,7 @@ ./services/synapse-bt.nix ./services/synergy ./services/yabai + ./services/nextdns ./programs/bash ./programs/fish.nix ./programs/gnupg.nix diff --git a/modules/services/nextdns/default.nix b/modules/services/nextdns/default.nix index 3cec427..2312096 100644 --- a/modules/services/nextdns/default.nix +++ b/modules/services/nextdns/default.nix @@ -30,10 +30,8 @@ in { launchd.daemons.nextdns = { path = [ nextdns ]; - script = '' - "${pkgs.nextdns}/bin/nextdns run ${escapeShellArgs cfg.arguments}"; - ''; - + serviceConfig.ProgramArguments = + [ "${pkgs.nextdns}/bin/nextdns" "run" (escapeShellArgs cfg.arguments) ]; serviceConfig.KeepAlive = true; serviceConfig.RunAtLoad = true; }; diff --git a/release.nix b/release.nix index 2747eb6..6dc3a52 100644 --- a/release.nix +++ b/release.nix @@ -118,6 +118,7 @@ let tests.sockets-nix-daemon = makeTest ./tests/sockets-nix-daemon.nix; tests.services-dnsmasq = makeTest ./tests/services-dnsmasq.nix; tests.services-nix-gc = makeTest ./tests/services-nix-gc.nix; + tests.services-nextdns = makeTest ./tests/services-nextdns.nix; tests.services-ofborg = makeTest ./tests/services-ofborg.nix; tests.services-offlineimap = makeTest ./tests/services-offlineimap.nix; tests.services-privoxy = makeTest ./tests/services-privoxy.nix; diff --git a/tests/services-nextdns.nix b/tests/services-nextdns.nix new file mode 100644 index 0000000..4d6224f --- /dev/null +++ b/tests/services-nextdns.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let nextdns = pkgs.runCommand "nextdns-0.0.0" { } "mkdir $out"; + +in { + services.nextdns.enable = true; + services.nextdns.arguments = [ "-config" "10.0.3.0/24=abcdef" ]; + + test = '' + echo >&2 "checking nextdns service in ~/Library/LaunchDaemons" + grep "org.nixos.nextdns" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist + grep "/bin/nextdns" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist + grep "'-config' '10.0.3.0/24=abcdef'" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist + ''; +} |