summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrique Goncalves <kamus@hadenes.io>2024-07-08 16:36:31 -0300
committerHenrique Goncalves <kamus@hadenes.io>2024-07-08 16:36:31 -0300
commite2a85731a071811457c151d2da385f9bb4ea5cdb (patch)
tree122fc74d829356e934c3e267c39971e46de71825
parent0f89b73f41eaa1dde67b291452c181d9a75f10dd (diff)
nextdns: fix argument handling
-rw-r--r--modules/services/nextdns/default.nix2
-rw-r--r--tests/services-nextdns.nix3
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/services/nextdns/default.nix b/modules/services/nextdns/default.nix
index 2312096..adc9823 100644
--- a/modules/services/nextdns/default.nix
+++ b/modules/services/nextdns/default.nix
@@ -31,7 +31,7 @@ in {
launchd.daemons.nextdns = {
path = [ nextdns ];
serviceConfig.ProgramArguments =
- [ "${pkgs.nextdns}/bin/nextdns" "run" (escapeShellArgs cfg.arguments) ];
+ [ "${pkgs.nextdns}/bin/nextdns" "run" ] ++ cfg.arguments;
serviceConfig.KeepAlive = true;
serviceConfig.RunAtLoad = true;
};
diff --git a/tests/services-nextdns.nix b/tests/services-nextdns.nix
index 4d6224f..02ce1a5 100644
--- a/tests/services-nextdns.nix
+++ b/tests/services-nextdns.nix
@@ -12,6 +12,7 @@ in {
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
+ grep -- "-config" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
+ grep "10.0.3.0/24=abcdef" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
'';
}