From 1013de19f1e1e4235e57c40f3ce3148d0e34fad4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 12 Jan 2021 20:03:06 +0100 Subject: nixos/searx: fix for 0.18.0 update --- nixos/tests/searx.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nixos/tests') diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index e5fee3466bfa..31c3c9bdcb21 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -39,6 +39,9 @@ import ./make-test-python.nix ({ pkgs, ...} : services.searx = { enable = true; + # searx refuses to run if unchanged + settings.server.secret_key = "somesecret"; + runInUwsgi = true; uwsgiConfig = { # serve using the uwsgi protocol -- cgit v1.2.3 From f741cccd456be47c0b56f5468df851f1182f4a1b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 12 Jan 2021 22:53:25 +0100 Subject: nixos/searx: remove settings.yml merging script Starting with 0.18.0, searx can merge the settings.yml automatically with the default values, so the script is obsolete. --- nixos/tests/searx.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'nixos/tests') diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 31c3c9bdcb21..357ade105358 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -22,13 +22,15 @@ import ./make-test-python.nix ({ pkgs, ...} : bind_address = "0.0.0.0"; secret_key = "@SEARX_SECRET_KEY@"; }; - settings.engines = { - wolframalpha = - { api_key = "@WOLFRAM_API_KEY@"; - engine = "wolframalpha_api"; - }; - startpage.shortcut = "start"; - }; + settings.engines = [ + { name = "wolframalpha"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + } + { name = "startpage"; + shortcut = "start"; + } + ]; }; }; @@ -109,4 +111,3 @@ import ./make-test-python.nix ({ pkgs, ...} : ) ''; }) - -- cgit v1.2.3